diff --git a/src/examples/py/pb_rpc_bench/benchmark_rpc_client_module.py b/src/examples/py/pb_rpc_bench/benchmark_rpc_client_module.py
index c8fdd9601..8fdc2d218 100644
--- a/src/examples/py/pb_rpc_bench/benchmark_rpc_client_module.py
+++ b/src/examples/py/pb_rpc_bench/benchmark_rpc_client_module.py
@@ -209,8 +209,13 @@ class BenchmarkRpcClientModule(aimrt_py.ModuleBase):
             status, _ = self.proxy.GetFooData(ctx, req)
             task_end_time = time.perf_counter_ns()
 
-            assert status.Code() == aimrt_py.RpcStatusRetCode.OK, f"GetFooData failed: {status}"
-            assert task_end_time > task_start_time, "Task end time is less than start time"
+            if status.Code() != aimrt_py.RpcStatusRetCode.OK:
+                aimrt_py.error(self.logger, f"GetFooData failed: {status.ToString()}")
+                continue
+            if task_end_time <= task_start_time:
+                aimrt_py.error(self.logger, f"Task end time {task_end_time} is less than start time {task_start_time}")
+                continue
+
             self.perf_data.append((task_end_time - task_start_time) / 1e3)  # us
 
             if plan['perf_mode'] == 'fixed-freq':
diff --git a/src/runtime/python_runtime/export_pb_type_support.h b/src/runtime/python_runtime/export_pb_type_support.h
index 3006657ef..4cadba96c 100644
--- a/src/runtime/python_runtime/export_pb_type_support.h
+++ b/src/runtime/python_runtime/export_pb_type_support.h
@@ -11,9 +11,6 @@
 #include "aimrt_module_c_interface/util/type_support_base.h"
 #include "aimrt_module_cpp_interface/util/string.h"
 
-#include "pybind11/functional.h"
-#include "pybind11/stl.h"
-
 namespace aimrt::runtime::python_runtime {
 
 class PyPbTypeSupport {
diff --git a/src/runtime/python_runtime/export_ros2_type_support.h b/src/runtime/python_runtime/export_ros2_type_support.h
index df4cc9abe..2ef05d236 100644
--- a/src/runtime/python_runtime/export_ros2_type_support.h
+++ b/src/runtime/python_runtime/export_ros2_type_support.h
@@ -11,10 +11,6 @@
 #include "aimrt_module_cpp_interface/util/string.h"
 #include "aimrt_module_ros2_interface/util/ros2_rcl_serialized_message_adapter.h"
 
-#include "pybind11/functional.h"
-#include "pybind11/stl.h"
-#include "rosidl_runtime_cpp/message_type_support_decl.hpp"
-
 #include "python_runtime/ros2_type_support_utils.h"
 
 namespace aimrt::runtime::python_runtime {
diff --git a/src/runtime/python_runtime/ros2_type_support_utils.cc b/src/runtime/python_runtime/ros2_type_support_utils.cc
index fce8d515e..a0f39ff66 100644
--- a/src/runtime/python_runtime/ros2_type_support_utils.cc
+++ b/src/runtime/python_runtime/ros2_type_support_utils.cc
@@ -14,6 +14,7 @@
 #include "rosidl_runtime_c/u16string.h"
 #include "rosidl_runtime_c/u16string_functions.h"  // IWYU pragma: keep
 #include "rosidl_typesupport_introspection_c/field_types.h"
+#include "rosidl_typesupport_introspection_c/identifier.h"
 #include "rosidl_typesupport_introspection_c/message_introspection.h"
 
 namespace aimrt::runtime::python_runtime {
diff --git a/src/runtime/python_runtime/ros2_type_support_utils.h b/src/runtime/python_runtime/ros2_type_support_utils.h
index b92883636..5c004a206 100644
--- a/src/runtime/python_runtime/ros2_type_support_utils.h
+++ b/src/runtime/python_runtime/ros2_type_support_utils.h
@@ -5,7 +5,6 @@
 
 #include "pybind11/pybind11.h"  // IWYU pragma: keep
 
-#include "rosidl_typesupport_introspection_c/identifier.h"
 #include "rosidl_typesupport_introspection_c/message_introspection.h"
 
 namespace aimrt::runtime::python_runtime {