diff --git a/tensorflow/compiler/xla/python/bfloat16.h b/tensorflow/compiler/xla/python/bfloat16.h
index 02fd10e04e8..9e52d086919 100644
--- a/tensorflow/compiler/xla/python/bfloat16.h
+++ b/tensorflow/compiler/xla/python/bfloat16.h
@@ -16,7 +16,7 @@ limitations under the License.
#ifndef TENSORFLOW_COMPILER_XLA_PYTHON_BFLOAT16_H_
#define TENSORFLOW_COMPILER_XLA_PYTHON_BFLOAT16_H_
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/compiler/xla/statusor.h"
namespace xla {
diff --git a/tensorflow/compiler/xla/python/dlpack.h b/tensorflow/compiler/xla/python/dlpack.h
index 92eba687225..5855311f6c4 100644
--- a/tensorflow/compiler/xla/python/dlpack.h
+++ b/tensorflow/compiler/xla/python/dlpack.h
@@ -16,7 +16,7 @@ limitations under the License.
#ifndef TENSORFLOW_COMPILER_XLA_PYTHON_DLPACK_H_
#define TENSORFLOW_COMPILER_XLA_PYTHON_DLPACK_H_
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/compiler/xla/python/local_client.h"
namespace xla {
diff --git a/tensorflow/compiler/xla/python/python_ref_manager.h b/tensorflow/compiler/xla/python/python_ref_manager.h
index 2c6ea16c7f7..0ad533c695f 100644
--- a/tensorflow/compiler/xla/python/python_ref_manager.h
+++ b/tensorflow/compiler/xla/python/python_ref_manager.h
@@ -22,7 +22,7 @@ limitations under the License.
#include "absl/container/inlined_vector.h"
#include "absl/synchronization/mutex.h"
#include "absl/types/span.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
namespace xla {
diff --git a/tensorflow/compiler/xla/python/tpu_driver/client/tpu_client_extension.cc b/tensorflow/compiler/xla/python/tpu_driver/client/tpu_client_extension.cc
index f6e2fab7ef0..4584344dd55 100644
--- a/tensorflow/compiler/xla/python/tpu_driver/client/tpu_client_extension.cc
+++ b/tensorflow/compiler/xla/python/tpu_driver/client/tpu_client_extension.cc
@@ -15,7 +15,7 @@ limitations under the License.
#include <vector>
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/compiler/xla/python/python_ref_manager.h"
#include "tensorflow/compiler/xla/python/tpu_driver/client/tpu_client.h"
#include "tensorflow/compiler/xla/python/types.h"
diff --git a/tensorflow/compiler/xla/python/types.h b/tensorflow/compiler/xla/python/types.h
index ceefbda4f90..6cda0ba3e04 100644
--- a/tensorflow/compiler/xla/python/types.h
+++ b/tensorflow/compiler/xla/python/types.h
@@ -22,9 +22,9 @@ limitations under the License.
#include "numpy/arrayobject.h"
#include "absl/container/inlined_vector.h"
#include "absl/types/optional.h"
-#include "include/pybind11/numpy.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/numpy.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
#include "tensorflow/compiler/xla/literal.h"
#include "tensorflow/compiler/xla/shape.h"
#include "tensorflow/compiler/xla/status.h"
diff --git a/tensorflow/compiler/xla/python/xla.cc b/tensorflow/compiler/xla/python/xla.cc
index 62d776f187d..34c3de12f5a 100644
--- a/tensorflow/compiler/xla/python/xla.cc
+++ b/tensorflow/compiler/xla/python/xla.cc
@@ -24,9 +24,9 @@ limitations under the License.
#include "absl/synchronization/mutex.h"
#include "absl/types/optional.h"
#include "absl/types/span.h"
-#include "include/pybind11/numpy.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/numpy.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
#include "tensorflow/compiler/xla/client/client_library.h"
#include "tensorflow/compiler/xla/client/lib/comparators.h"
#include "tensorflow/compiler/xla/client/lib/math.h"
diff --git a/tensorflow/lite/testing/string_util_wrapper.cc b/tensorflow/lite/testing/string_util_wrapper.cc
index f5b490ab617..8d7d4588c3b 100644
--- a/tensorflow/lite/testing/string_util_wrapper.cc
+++ b/tensorflow/lite/testing/string_util_wrapper.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
#include "tensorflow/lite/testing/string_util.h"
#include "tensorflow/python/lib/core/pybind11_lib.h"
diff --git a/tensorflow/lite/tools/optimize/sparsity/python/format_converter_extension.cc b/tensorflow/lite/tools/optimize/sparsity/python/format_converter_extension.cc
index 59cd7b46fa0..5a0091e9e89 100644
--- a/tensorflow/lite/tools/optimize/sparsity/python/format_converter_extension.cc
+++ b/tensorflow/lite/tools/optimize/sparsity/python/format_converter_extension.cc
@@ -15,8 +15,8 @@ limitations under the License.
#include <vector>
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
#include "tensorflow/lite/c/common.h"
#include "tensorflow/lite/tools/optimize/sparsity/format_converter.h"
diff --git a/tensorflow/python/autograph/impl/testing/pybind_for_testing.cc b/tensorflow/python/autograph/impl/testing/pybind_for_testing.cc
index cdeabde8390..09a86afc594 100644
--- a/tensorflow/python/autograph/impl/testing/pybind_for_testing.cc
+++ b/tensorflow/python/autograph/impl/testing/pybind_for_testing.cc
@@ -13,9 +13,9 @@
// limitations under the License.
// ==============================================================================
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
+#include "pybind11/stl.h"
namespace autograph {
diff --git a/tensorflow/python/client/debug_events_writer_wrapper.cc b/tensorflow/python/client/debug_events_writer_wrapper.cc
index 75abf70d749..a786c6f2db6 100644
--- a/tensorflow/python/client/debug_events_writer_wrapper.cc
+++ b/tensorflow/python/client/debug_events_writer_wrapper.cc
@@ -14,8 +14,8 @@ limitations under the License.
==============================================================================*/
#include "absl/strings/string_view.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
#include "tensorflow/core/lib/core/status.h"
#include "tensorflow/core/lib/strings/stringprintf.h"
#include "tensorflow/core/util/debug_events_writer.h"
diff --git a/tensorflow/python/client/device_lib_wrapper.cc b/tensorflow/python/client/device_lib_wrapper.cc
index 62ce47669d8..70f6edb1903 100644
--- a/tensorflow/python/client/device_lib_wrapper.cc
+++ b/tensorflow/python/client/device_lib_wrapper.cc
@@ -15,7 +15,7 @@ limitations under the License.
#include <string>
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/common_runtime/device.h"
#include "tensorflow/core/common_runtime/device_factory.h"
#include "tensorflow/core/framework/device_attributes.pb.h"
diff --git a/tensorflow/python/client/events_writer_wrapper.cc b/tensorflow/python/client/events_writer_wrapper.cc
index 22b3811c93d..d7dbd3f3b4d 100644
--- a/tensorflow/python/client/events_writer_wrapper.cc
+++ b/tensorflow/python/client/events_writer_wrapper.cc
@@ -14,8 +14,8 @@ limitations under the License.
==============================================================================*/
#include "absl/strings/string_view.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
#include "tensorflow/core/util/events_writer.h"
#include "tensorflow/python/lib/core/pybind11_absl.h"
#include "tensorflow/python/lib/core/pybind11_proto.h"
diff --git a/tensorflow/python/client/tf_session_wrapper.cc b/tensorflow/python/client/tf_session_wrapper.cc
index 46d48b12dfa..14fda32f956 100644
--- a/tensorflow/python/client/tf_session_wrapper.cc
+++ b/tensorflow/python/client/tf_session_wrapper.cc
@@ -15,11 +15,11 @@ limitations under the License.
#include "Python.h"
#include "absl/types/optional.h"
-#include "include/pybind11/chrono.h"
-#include "include/pybind11/complex.h"
-#include "include/pybind11/functional.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/chrono.h"
+#include "pybind11/complex.h"
+#include "pybind11/functional.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
#include "tensorflow/c/c_api.h"
#include "tensorflow/c/c_api_experimental.h"
#include "tensorflow/c/c_api_internal.h"
diff --git a/tensorflow/python/framework/dtypes.cc b/tensorflow/python/framework/dtypes.cc
index 7c8521bd2d0..d138bd07af6 100644
--- a/tensorflow/python/framework/dtypes.cc
+++ b/tensorflow/python/framework/dtypes.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/detail/common.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/detail/common.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/framework/types.pb.h"
diff --git a/tensorflow/python/framework/memory_checker_test_helper.cc b/tensorflow/python/framework/memory_checker_test_helper.cc
index f210a447867..545c1ec99cf 100644
--- a/tensorflow/python/framework/memory_checker_test_helper.cc
+++ b/tensorflow/python/framework/memory_checker_test_helper.cc
@@ -15,7 +15,7 @@ limitations under the License.
#include <list>
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
namespace py = pybind11;
diff --git a/tensorflow/python/framework/op_def_registry.cc b/tensorflow/python/framework/op_def_registry.cc
index 0de2ce01b96..31cbb92560f 100644
--- a/tensorflow/python/framework/op_def_registry.cc
+++ b/tensorflow/python/framework/op_def_registry.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/framework/op.h"
#include "tensorflow/core/framework/op_def.pb.h"
#include "tensorflow/core/framework/op_def_util.h"
diff --git a/tensorflow/python/framework/python_memory_checker_helper.cc b/tensorflow/python/framework/python_memory_checker_helper.cc
index cd27b6dc8ec..2d7ed70f821 100644
--- a/tensorflow/python/framework/python_memory_checker_helper.cc
+++ b/tensorflow/python/framework/python_memory_checker_helper.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
namespace py = pybind11;
diff --git a/tensorflow/python/framework/python_op_gen_wrapper.cc b/tensorflow/python/framework/python_op_gen_wrapper.cc
index 941843292b5..501f0f1a198 100644
--- a/tensorflow/python/framework/python_op_gen_wrapper.cc
+++ b/tensorflow/python/framework/python_op_gen_wrapper.cc
@@ -16,7 +16,7 @@ limitations under the License.
#include <Python.h>
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/python/framework/python_op_gen.h"
namespace py = pybind11;
diff --git a/tensorflow/python/grappler/cluster_wrapper.cc b/tensorflow/python/grappler/cluster_wrapper.cc
index 4cec2d9f5f9..aa762cb1dd9 100644
--- a/tensorflow/python/grappler/cluster_wrapper.cc
+++ b/tensorflow/python/grappler/cluster_wrapper.cc
@@ -24,8 +24,8 @@ limitations under the License.
#include <unordered_map>
#include <vector>
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
#include "tensorflow/core/framework/kernel_def.pb.h"
#include "tensorflow/core/framework/memory_types.h"
#include "tensorflow/core/framework/op_def.pb.h"
diff --git a/tensorflow/python/grappler/cost_analyzer_wrapper.cc b/tensorflow/python/grappler/cost_analyzer_wrapper.cc
index 31fc0384a1b..ce557b02e8d 100644
--- a/tensorflow/python/grappler/cost_analyzer_wrapper.cc
+++ b/tensorflow/python/grappler/cost_analyzer_wrapper.cc
@@ -17,7 +17,7 @@ limitations under the License.
#include <sstream>
#include <string>
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/grappler/clusters/single_machine.h"
#include "tensorflow/core/grappler/grappler_item.h"
#include "tensorflow/core/grappler/grappler_item_builder.h"
diff --git a/tensorflow/python/grappler/graph_analyzer_tool_wrapper.cc b/tensorflow/python/grappler/graph_analyzer_tool_wrapper.cc
index 2d82942d55f..834bee7831f 100644
--- a/tensorflow/python/grappler/graph_analyzer_tool_wrapper.cc
+++ b/tensorflow/python/grappler/graph_analyzer_tool_wrapper.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/grappler/graph_analyzer/graph_analyzer_tool.h"
PYBIND11_MODULE(_pywrap_graph_analyzer_tool, m) {
diff --git a/tensorflow/python/grappler/item_wrapper.cc b/tensorflow/python/grappler/item_wrapper.cc
index d1c50f4e21a..e55b468a6ba 100644
--- a/tensorflow/python/grappler/item_wrapper.cc
+++ b/tensorflow/python/grappler/item_wrapper.cc
@@ -19,8 +19,8 @@ limitations under the License.
#include <unordered_map>
#include <vector>
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
#include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/framework/node_def_util.h"
#include "tensorflow/core/framework/op.h"
diff --git a/tensorflow/python/grappler/model_analyzer_wrapper.cc b/tensorflow/python/grappler/model_analyzer_wrapper.cc
index d9699a69a8d..47d1ec89897 100644
--- a/tensorflow/python/grappler/model_analyzer_wrapper.cc
+++ b/tensorflow/python/grappler/model_analyzer_wrapper.cc
@@ -16,7 +16,7 @@ limitations under the License.
#include <memory>
#include <sstream>
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/grappler/grappler_item_builder.h"
#include "tensorflow/core/protobuf/meta_graph.pb.h"
#include "tensorflow/python/grappler/model_analyzer.h"
diff --git a/tensorflow/python/grappler/tf_optimizer_wrapper.cc b/tensorflow/python/grappler/tf_optimizer_wrapper.cc
index 91aeae473c0..14336a08cf5 100644
--- a/tensorflow/python/grappler/tf_optimizer_wrapper.cc
+++ b/tensorflow/python/grappler/tf_optimizer_wrapper.cc
@@ -18,7 +18,7 @@ limitations under the License.
#include <string>
#include <unordered_map>
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/common_runtime/device.h"
#include "tensorflow/core/common_runtime/device_factory.h"
#include "tensorflow/core/framework/device_attributes.pb.h"
diff --git a/tensorflow/python/lib/core/bfloat16_wrapper.cc b/tensorflow/python/lib/core/bfloat16_wrapper.cc
index 4a8e180c154..eb346af896a 100644
--- a/tensorflow/python/lib/core/bfloat16_wrapper.cc
+++ b/tensorflow/python/lib/core/bfloat16_wrapper.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/python/lib/core/bfloat16.h"
PYBIND11_MODULE(_pywrap_bfloat16, m) {
diff --git a/tensorflow/python/lib/core/py_exception_registry_wrapper.cc b/tensorflow/python/lib/core/py_exception_registry_wrapper.cc
index 2ae56c3f671..c964d5c64c8 100644
--- a/tensorflow/python/lib/core/py_exception_registry_wrapper.cc
+++ b/tensorflow/python/lib/core/py_exception_registry_wrapper.cc
@@ -17,8 +17,8 @@ limitations under the License.
#include <array>
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
#include "tensorflow/python/lib/core/py_exception_registry.h"
namespace py = pybind11;
diff --git a/tensorflow/python/lib/core/py_func_wrapper.cc b/tensorflow/python/lib/core/py_func_wrapper.cc
index 7c3209a3f50..34e6b2df80a 100644
--- a/tensorflow/python/lib/core/py_func_wrapper.cc
+++ b/tensorflow/python/lib/core/py_func_wrapper.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/python/lib/core/py_func.h"
namespace py = pybind11;
diff --git a/tensorflow/python/lib/core/pybind11_absl.h b/tensorflow/python/lib/core/pybind11_absl.h
index db3631dc643..8a05d419654 100644
--- a/tensorflow/python/lib/core/pybind11_absl.h
+++ b/tensorflow/python/lib/core/pybind11_absl.h
@@ -16,7 +16,7 @@ limitations under the License.
#ifndef TENSORFLOW_PYTHON_LIB_CORE_PYBIND11_ABSL_H_
#define TENSORFLOW_PYTHON_LIB_CORE_PYBIND11_ABSL_H_
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/platform/stringpiece.h"
#ifndef ABSL_USES_STD_STRING_VIEW
diff --git a/tensorflow/python/lib/core/pybind11_lib.h b/tensorflow/python/lib/core/pybind11_lib.h
index 93cae530337..cc2a118d93f 100644
--- a/tensorflow/python/lib/core/pybind11_lib.h
+++ b/tensorflow/python/lib/core/pybind11_lib.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
#ifndef TENSORFLOW_PYTHON_LIB_CORE_PYBIND11_LIB_H_
#define TENSORFLOW_PYTHON_LIB_CORE_PYBIND11_LIB_H_
diff --git a/tensorflow/python/lib/core/pybind11_proto.h b/tensorflow/python/lib/core/pybind11_proto.h
index e99518f2ac4..d69d717d5a0 100644
--- a/tensorflow/python/lib/core/pybind11_proto.h
+++ b/tensorflow/python/lib/core/pybind11_proto.h
@@ -17,7 +17,7 @@ limitations under the License.
#define TENSORFLOW_PYTHON_LIB_CORE_PYBIND11_PROTO_H_
#include "absl/strings/str_cat.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
namespace tensorflow {
diff --git a/tensorflow/python/lib/core/pybind11_status.h b/tensorflow/python/lib/core/pybind11_status.h
index b3ef3260792..feb974798de 100644
--- a/tensorflow/python/lib/core/pybind11_status.h
+++ b/tensorflow/python/lib/core/pybind11_status.h
@@ -18,7 +18,7 @@ limitations under the License.
#include <Python.h>
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/c/tf_status.h"
#include "tensorflow/core/lib/core/status.h"
#include "tensorflow/core/protobuf/error_codes.pb.h"
diff --git a/tensorflow/python/lib/io/file_io_wrapper.cc b/tensorflow/python/lib/io/file_io_wrapper.cc
index e104881a64d..de806a9c969 100644
--- a/tensorflow/python/lib/io/file_io_wrapper.cc
+++ b/tensorflow/python/lib/io/file_io_wrapper.cc
@@ -17,8 +17,8 @@ limitations under the License.
#include <string>
#include <vector>
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
#include "tensorflow/core/lib/core/error_codes.pb.h"
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/core/status.h"
diff --git a/tensorflow/python/lib/io/record_io_wrapper.cc b/tensorflow/python/lib/io/record_io_wrapper.cc
index ba71920bf80..d558301eeba 100644
--- a/tensorflow/python/lib/io/record_io_wrapper.cc
+++ b/tensorflow/python/lib/io/record_io_wrapper.cc
@@ -17,7 +17,7 @@ limitations under the License.
#include <string>
#include "absl/memory/memory.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/core/stringpiece.h"
#include "tensorflow/core/lib/io/record_reader.h"
diff --git a/tensorflow/python/lite/toco_python_api_wrapper.cc b/tensorflow/python/lite/toco_python_api_wrapper.cc
index 9199c79a48f..e65b8a0961c 100644
--- a/tensorflow/python/lite/toco_python_api_wrapper.cc
+++ b/tensorflow/python/lite/toco_python_api_wrapper.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/lite/toco/python/toco_python_api.h"
#include "tensorflow/python/lib/core/pybind11_lib.h"
diff --git a/tensorflow/python/mlir_wrapper.cc b/tensorflow/python/mlir_wrapper.cc
index 3e835663101..9b40ab4cb71 100644
--- a/tensorflow/python/mlir_wrapper.cc
+++ b/tensorflow/python/mlir_wrapper.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/c/tf_status.h"
#include "tensorflow/compiler/mlir/python/mlir.h"
#include "tensorflow/python/lib/core/pybind11_lib.h"
diff --git a/tensorflow/python/platform/stacktrace_handler_wrapper.cc b/tensorflow/python/platform/stacktrace_handler_wrapper.cc
index 7d16f44c8c0..908127b3cca 100644
--- a/tensorflow/python/platform/stacktrace_handler_wrapper.cc
+++ b/tensorflow/python/platform/stacktrace_handler_wrapper.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/platform/stacktrace_handler.h"
namespace py = pybind11;
diff --git a/tensorflow/python/profiler/internal/profiler_wrapper.cc b/tensorflow/python/profiler/internal/profiler_wrapper.cc
index c7780b7dc01..d02fbc4ecb8 100644
--- a/tensorflow/python/profiler/internal/profiler_wrapper.cc
+++ b/tensorflow/python/profiler/internal/profiler_wrapper.cc
@@ -16,7 +16,7 @@ limitations under the License.
#include <memory>
#include "absl/memory/memory.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/platform/host_info.h"
#include "tensorflow/core/platform/types.h"
#include "tensorflow/core/profiler/convert/xplane_to_profile_response.h"
diff --git a/tensorflow/python/profiler/internal/scoped_annotation_wrapper.cc b/tensorflow/python/profiler/internal/scoped_annotation_wrapper.cc
index 8a3364cd859..078ebb0966c 100644
--- a/tensorflow/python/profiler/internal/scoped_annotation_wrapper.cc
+++ b/tensorflow/python/profiler/internal/scoped_annotation_wrapper.cc
@@ -16,7 +16,7 @@ limitations under the License.
#include <utility>
#include "absl/types/optional.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/platform/types.h"
#include "tensorflow/core/profiler/lib/scoped_annotation.h"
diff --git a/tensorflow/python/profiler/internal/traceme_wrapper.cc b/tensorflow/python/profiler/internal/traceme_wrapper.cc
index a2705d54df1..6ae7f4124ee 100644
--- a/tensorflow/python/profiler/internal/traceme_wrapper.cc
+++ b/tensorflow/python/profiler/internal/traceme_wrapper.cc
@@ -16,7 +16,7 @@ limitations under the License.
#include <utility>
#include "absl/types/optional.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/platform/types.h"
#include "tensorflow/core/profiler/lib/traceme.h"
diff --git a/tensorflow/python/tfcompile_wrapper.cc b/tensorflow/python/tfcompile_wrapper.cc
index ac69d326663..c8818309919 100644
--- a/tensorflow/python/tfcompile_wrapper.cc
+++ b/tensorflow/python/tfcompile_wrapper.cc
@@ -15,10 +15,10 @@ limitations under the License.
#include <string>
-#include "include/pybind11/cast.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/cast.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
+#include "pybind11/stl.h"
#include "tensorflow/compiler/aot/compile.h"
#include "tensorflow/compiler/aot/flags.h"
#include "tensorflow/python/lib/core/pybind11_lib.h"
diff --git a/tensorflow/python/tfe_wrapper.cc b/tensorflow/python/tfe_wrapper.cc
index fc5baafcb49..e3682e9613e 100644
--- a/tensorflow/python/tfe_wrapper.cc
+++ b/tensorflow/python/tfe_wrapper.cc
@@ -16,11 +16,11 @@ limitations under the License.
#include <memory>
#include "Python.h"
-#include "include/pybind11/chrono.h"
-#include "include/pybind11/complex.h"
-#include "include/pybind11/functional.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/chrono.h"
+#include "pybind11/complex.h"
+#include "pybind11/functional.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
#include "tensorflow/c/c_api.h"
#include "tensorflow/c/c_api_experimental.h"
#include "tensorflow/c/eager/c_api.h"
diff --git a/tensorflow/python/training/quantize_training_wrapper.cc b/tensorflow/python/training/quantize_training_wrapper.cc
index f4173553ed6..27abc27c4a2 100644
--- a/tensorflow/python/training/quantize_training_wrapper.cc
+++ b/tensorflow/python/training/quantize_training_wrapper.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/graph/quantize_training.h"
#include "tensorflow/python/lib/core/pybind11_lib.h"
#include "tensorflow/python/lib/core/pybind11_status.h"
diff --git a/tensorflow/python/util/kernel_registry_wrapper.cc b/tensorflow/python/util/kernel_registry_wrapper.cc
index 625b6598e10..3f607c13b12 100644
--- a/tensorflow/python/util/kernel_registry_wrapper.cc
+++ b/tensorflow/python/util/kernel_registry_wrapper.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/python/util/kernel_registry.h"
namespace py = pybind11;
diff --git a/tensorflow/python/util/port_wrapper.cc b/tensorflow/python/util/port_wrapper.cc
index c1b102f328b..8f0ab98b778 100644
--- a/tensorflow/python/util/port_wrapper.cc
+++ b/tensorflow/python/util/port_wrapper.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
#include "tensorflow/core/util/port.h"
PYBIND11_MODULE(_pywrap_util_port, m) {
diff --git a/tensorflow/python/util/py_checkpoint_reader_wrapper.cc b/tensorflow/python/util/py_checkpoint_reader_wrapper.cc
index a7076f6ee29..d034505c66d 100644
--- a/tensorflow/python/util/py_checkpoint_reader_wrapper.cc
+++ b/tensorflow/python/util/py_checkpoint_reader_wrapper.cc
@@ -18,11 +18,11 @@ limitations under the License.
#include "numpy/arrayobject.h"
#include "numpy/ufuncobject.h"
-#include "include/pybind11/chrono.h"
-#include "include/pybind11/complex.h"
-#include "include/pybind11/functional.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/chrono.h"
+#include "pybind11/complex.h"
+#include "pybind11/functional.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
#include "tensorflow/c/checkpoint_reader.h"
#include "tensorflow/c/tf_status.h"
#include "tensorflow/core/lib/core/errors.h"
diff --git a/tensorflow/python/util/stat_summarizer_wrapper.cc b/tensorflow/python/util/stat_summarizer_wrapper.cc
index f46ddc518e0..886c8cb50de 100644
--- a/tensorflow/python/util/stat_summarizer_wrapper.cc
+++ b/tensorflow/python/util/stat_summarizer_wrapper.cc
@@ -16,8 +16,8 @@ limitations under the License.
#include <memory>
#include "absl/memory/memory.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
#include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/framework/step_stats.pb.h"
#include "tensorflow/core/util/stat_summarizer.h"
diff --git a/tensorflow/python/util/tf_stack.cc b/tensorflow/python/util/tf_stack.cc
index 4e0f3dd4dc9..5c18c87ad32 100644
--- a/tensorflow/python/util/tf_stack.cc
+++ b/tensorflow/python/util/tf_stack.cc
@@ -19,8 +19,8 @@ limitations under the License.
#include <algorithm>
#include <vector>
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl_bind.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl_bind.h"
struct FrameSummary; // Forward declaration.
diff --git a/tensorflow/python/util/tfprof_wrapper.cc b/tensorflow/python/util/tfprof_wrapper.cc
index 0d7b51840bb..55fc4f0e87d 100644
--- a/tensorflow/python/util/tfprof_wrapper.cc
+++ b/tensorflow/python/util/tfprof_wrapper.cc
@@ -15,7 +15,7 @@ limitations under the License.
#include <string>
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/profiler/internal/print_model_analysis.h"
diff --git a/tensorflow/python/util/transform_graph_wrapper.cc b/tensorflow/python/util/transform_graph_wrapper.cc
index 1859f0a2b5b..24d67c7b6f7 100644
--- a/tensorflow/python/util/transform_graph_wrapper.cc
+++ b/tensorflow/python/util/transform_graph_wrapper.cc
@@ -16,7 +16,7 @@ limitations under the License.
#include <string>
#include <vector>
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
#include "tensorflow/core/lib/strings/str_util.h"
#include "tensorflow/core/platform/types.h"
#include "tensorflow/python/lib/core/pybind11_status.h"
diff --git a/tensorflow/python/util/util_wrapper.cc b/tensorflow/python/util/util_wrapper.cc
index 6df78f5db44..22cbdecbfaf 100644
--- a/tensorflow/python/util/util_wrapper.cc
+++ b/tensorflow/python/util/util_wrapper.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
#include "tensorflow/python/lib/core/pybind11_lib.h"
#include "tensorflow/python/util/util.h"
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index cdf23829b78..449af92ce09 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -1045,6 +1045,7 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
sha256 = "1eed57bc6863190e35637290f97a20c81cfe4d9090ac0a24f3bbf08f265eb71d",
strip_prefix = "pybind11-2.4.3",
build_file = clean_dep("//third_party:pybind11.BUILD"),
+ system_build_file = clean_dep("//third_party/systemlibs:pybind11.BUILD"),
)
tf_http_archive(
diff --git a/third_party/pybind11.BUILD b/third_party/pybind11.BUILD
index 95f452c05af..2f1ada6193c 100644
--- a/third_party/pybind11.BUILD
+++ b/third_party/pybind11.BUILD
@@ -18,6 +18,7 @@ cc_library(
"-Wno-pragma-once-outside-header",
],
includes = ["include"],
+ strip_include_prefix = "include",
deps = [
"@org_tensorflow//third_party/python_runtime:headers",
],
diff --git a/third_party/systemlibs/pybind11.BUILD b/third_party/systemlibs/pybind11.BUILD
new file mode 100644
index 00000000000..79a483d7b5d
--- /dev/null
+++ b/third_party/systemlibs/pybind11.BUILD
@@ -0,0 +1,8 @@
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+ name = "pybind11",
+ deps = [
+ "@org_tensorflow//third_party/python_runtime:headers",
+ ],
+)
diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl
index 42c6ba73002..217c0131186 100644
--- a/third_party/systemlibs/syslibs_configure.bzl
+++ b/third_party/systemlibs/syslibs_configure.bzl
@@ -38,6 +38,7 @@ VALID_LIBS = [
"pasta",
"pcre",
"png",
+ "pybind11",
"six_archive",
"snappy",
"swig",