diff --git a/include/onnxruntime/core/framework/op_kernel.h b/include/onnxruntime/core/framework/op_kernel.h
index 5654c3ad42059..f0bfe2fff160b 100644
--- a/include/onnxruntime/core/framework/op_kernel.h
+++ b/include/onnxruntime/core/framework/op_kernel.h
@@ -15,7 +15,7 @@
 #include "core/framework/op_node_proto_helper.h"
 #include "core/framework/tensor.h"
 #include "core/graph/constants.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "gsl/span"
 #include "onnx/defs/schema.h"
 
diff --git a/include/onnxruntime/core/framework/op_kernel_info.h b/include/onnxruntime/core/framework/op_kernel_info.h
index 31e80ce69974d..c0b263c33dbd7 100644
--- a/include/onnxruntime/core/framework/op_kernel_info.h
+++ b/include/onnxruntime/core/framework/op_kernel_info.h
@@ -7,7 +7,7 @@
 #include "core/framework/kernel_def_builder.h"
 #include "core/framework/ml_value.h"
 #include "core/framework/op_node_proto_helper.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "gsl/span"
 #include "gsl/gsl_util"
 
diff --git a/include/onnxruntime/core/framework/op_node_proto_helper.h b/include/onnxruntime/core/framework/op_node_proto_helper.h
index ce79412df800d..03d0849cd6573 100644
--- a/include/onnxruntime/core/framework/op_node_proto_helper.h
+++ b/include/onnxruntime/core/framework/op_node_proto_helper.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "core/common/status.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "gsl/span"
 
 #ifdef __has_attribute
diff --git a/include/onnxruntime/core/graph/graph_transformer.h b/include/onnxruntime/core/graph/graph_transformer.h
index 28824b25aca5c..78493f695b501 100644
--- a/include/onnxruntime/core/graph/graph_transformer.h
+++ b/include/onnxruntime/core/graph/graph_transformer.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "core/common/common.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/rewrite_rule.h"
 
 namespace onnxruntime {
diff --git a/include/onnxruntime/core/graph/graph.h b/include/onnxruntime/core/graph/graph_viewer.h
similarity index 100%
rename from include/onnxruntime/core/graph/graph.h
rename to include/onnxruntime/core/graph/graph_viewer.h
diff --git a/include/onnxruntime/core/graph/rewrite_rule.h b/include/onnxruntime/core/graph/rewrite_rule.h
index f276421a2da14..d98c3779d9280 100644
--- a/include/onnxruntime/core/graph/rewrite_rule.h
+++ b/include/onnxruntime/core/graph/rewrite_rule.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "core/common/common.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 
 namespace onnxruntime {
 
diff --git a/onnxruntime/core/codegen/tvm/tvm_compiler.h b/onnxruntime/core/codegen/tvm/tvm_compiler.h
index 5574652cc3ad4..624d5d260aa96 100644
--- a/onnxruntime/core/codegen/tvm/tvm_compiler.h
+++ b/onnxruntime/core/codegen/tvm/tvm_compiler.h
@@ -8,7 +8,7 @@
 #include "core/framework/data_types.h"
 #include "core/graph/function.h"
 #include "core/graph/constants.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 namespace onnxruntime {
 
 //TODO: this is just initial design to represent TVM Graph, to make the basic test work.
diff --git a/onnxruntime/core/framework/allocation_planner.h b/onnxruntime/core/framework/allocation_planner.h
index 4e5db48c1e484..e220606df7f58 100644
--- a/onnxruntime/core/framework/allocation_planner.h
+++ b/onnxruntime/core/framework/allocation_planner.h
@@ -7,7 +7,7 @@
 #include "core/framework/alloc_kind.h"
 #include "core/framework/allocator.h"
 #include "core/framework/sequential_execution_plan.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 namespace ONNX_NAMESPACE {
 class TensorShapeProto;
 }
diff --git a/onnxruntime/core/framework/execution_frame.h b/onnxruntime/core/framework/execution_frame.h
index 3f946a26ad74c..60b32963fccb6 100644
--- a/onnxruntime/core/framework/execution_frame.h
+++ b/onnxruntime/core/framework/execution_frame.h
@@ -11,7 +11,7 @@
 #include "core/framework/ml_value.h"
 #include "core/framework/sequential_execution_plan.h"
 #include "core/framework/tensor.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 
 namespace onnxruntime {
 
diff --git a/onnxruntime/core/framework/execution_provider.cc b/onnxruntime/core/framework/execution_provider.cc
index 09a302d338cf7..e5b7cf02d0fc0 100644
--- a/onnxruntime/core/framework/execution_provider.cc
+++ b/onnxruntime/core/framework/execution_provider.cc
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #include "core/framework/execution_provider.h"
 
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/framework/computation_capacity.h"
 #include "core/framework/kernel_registry_manager.h"
 #include "core/framework/op_kernel.h"
diff --git a/onnxruntime/core/framework/execution_providers.h b/onnxruntime/core/framework/execution_providers.h
index 298e5373b3e9b..a4c05b4bf8dd8 100644
--- a/onnxruntime/core/framework/execution_providers.h
+++ b/onnxruntime/core/framework/execution_providers.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "core/framework/execution_provider.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/common/logging/logging.h"
 
 namespace onnxruntime {
diff --git a/onnxruntime/core/framework/graph_partitioner.cc b/onnxruntime/core/framework/graph_partitioner.cc
index 3440c4fa0017a..57d74f1b92f5f 100644
--- a/onnxruntime/core/framework/graph_partitioner.cc
+++ b/onnxruntime/core/framework/graph_partitioner.cc
@@ -5,7 +5,7 @@
 
 #include "core/framework/kernel_registry_manager.h"
 #include "core/graph/function.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/framework/computation_capacity.h"
 #include "core/framework/kernel_registry_manager.h"
 #include "core/framework/execution_providers.h"
diff --git a/onnxruntime/core/framework/graph_partitioner.h b/onnxruntime/core/framework/graph_partitioner.h
index a22589f1a7a4d..b03ad8c844bf5 100644
--- a/onnxruntime/core/framework/graph_partitioner.h
+++ b/onnxruntime/core/framework/graph_partitioner.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "core/common/common.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/framework/op_kernel.h"
 
 namespace onnxruntime {
diff --git a/onnxruntime/core/framework/insert_cast_transformer.h b/onnxruntime/core/framework/insert_cast_transformer.h
index ec35424e147ce..b338a431f75a4 100644
--- a/onnxruntime/core/framework/insert_cast_transformer.h
+++ b/onnxruntime/core/framework/insert_cast_transformer.h
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/graph_transformer.h"
 #include "core/common/common.h"
 #include "core/framework/op_kernel.h"
diff --git a/onnxruntime/core/framework/kernel_registry_manager.h b/onnxruntime/core/framework/kernel_registry_manager.h
index 6cd6eb349960b..e41fb3cb03da7 100644
--- a/onnxruntime/core/framework/kernel_registry_manager.h
+++ b/onnxruntime/core/framework/kernel_registry_manager.h
@@ -7,7 +7,7 @@
 #include <list>
 #include <mutex>
 #include "core/common/status.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 
 namespace onnxruntime {
 struct KernelCreateInfo;
diff --git a/onnxruntime/core/framework/mldata_type_utils.h b/onnxruntime/core/framework/mldata_type_utils.h
index 1e3321bc6e868..000acdaffae1a 100644
--- a/onnxruntime/core/framework/mldata_type_utils.h
+++ b/onnxruntime/core/framework/mldata_type_utils.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "core/framework/data_types.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "onnx/defs/data_type_utils.h"
 
 namespace onnxruntime {
diff --git a/onnxruntime/core/framework/op_node_proto_helper.cc b/onnxruntime/core/framework/op_node_proto_helper.cc
index 3e1cf306c7325..e85f27f63627d 100644
--- a/onnxruntime/core/framework/op_node_proto_helper.cc
+++ b/onnxruntime/core/framework/op_node_proto_helper.cc
@@ -4,7 +4,7 @@
 #include "core/common/exceptions.h"
 #include "core/common/status.h"
 #include "core/common/logging/logging.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/op.h"
 #include "onnx/defs/schema.h"
 #include "core/framework/op_kernel.h"
diff --git a/onnxruntime/core/framework/parallel_executor.h b/onnxruntime/core/framework/parallel_executor.h
index a8a465c7c64e6..6acc748fac804 100644
--- a/onnxruntime/core/framework/parallel_executor.h
+++ b/onnxruntime/core/framework/parallel_executor.h
@@ -12,7 +12,7 @@
 #include "core/framework/framework_common.h"
 #include "core/framework/ml_value.h"
 #include "core/framework/session_state.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 
 namespace onnxruntime {
 
diff --git a/onnxruntime/core/framework/sequential_executor.h b/onnxruntime/core/framework/sequential_executor.h
index 1f18b36eee20d..fd73a91eea04a 100644
--- a/onnxruntime/core/framework/sequential_executor.h
+++ b/onnxruntime/core/framework/sequential_executor.h
@@ -11,7 +11,7 @@
 #include "core/framework/framework_common.h"
 #include "core/framework/ml_value.h"
 #include "core/framework/session_state.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 
 namespace onnxruntime {
 class SequentialExecutor : public IExecutor {
diff --git a/onnxruntime/core/framework/session_state.h b/onnxruntime/core/framework/session_state.h
index 0f09424fc6f18..b700bb671d17e 100644
--- a/onnxruntime/core/framework/session_state.h
+++ b/onnxruntime/core/framework/session_state.h
@@ -18,7 +18,7 @@
 #include "core/framework/mem_pattern.h"
 #include "core/framework/ml_value.h"
 #include "core/framework/mlvalue_name_idx_map.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 
 namespace onnxruntime {
 
diff --git a/onnxruntime/core/framework/session_state_initializer.cc b/onnxruntime/core/framework/session_state_initializer.cc
index edceb317f771d..b438718ae38b7 100644
--- a/onnxruntime/core/framework/session_state_initializer.cc
+++ b/onnxruntime/core/framework/session_state_initializer.cc
@@ -8,7 +8,7 @@
 #include "core/common/common.h"
 #include "core/common/logging/logging.h"
 
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/graph_transformer.h"
 #include "core/graph/graph_transformer_mgr.h"
 
diff --git a/onnxruntime/core/framework/utils.cc b/onnxruntime/core/framework/utils.cc
index 914f44c9f8026..05e6f7bd126e9 100644
--- a/onnxruntime/core/framework/utils.cc
+++ b/onnxruntime/core/framework/utils.cc
@@ -3,7 +3,7 @@
 
 #include "core/framework/utils.h"
 
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 
 #include "core/framework/execution_providers.h"
 #include "core/framework/kernel_def_builder.h"
diff --git a/onnxruntime/core/graph/function.cc b/onnxruntime/core/graph/function.cc
index afbaf2a16f5fe..b54cb6acc80c1 100644
--- a/onnxruntime/core/graph/function.cc
+++ b/onnxruntime/core/graph/function.cc
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "core/graph/function_impl.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "onnx/shape_inference/implementation.h"
 
diff --git a/onnxruntime/core/graph/graph.cc b/onnxruntime/core/graph/graph.cc
index 1acb349d60bc3..ddbe873d8de37 100644
--- a/onnxruntime/core/graph/graph.cc
+++ b/onnxruntime/core/graph/graph.cc
@@ -14,7 +14,7 @@
 #include "gsl/pointers"
 #include "core/graph/function.h"
 #include "core/graph/function_impl.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/indexed_sub_graph.h"
 #include "core/graph/op.h"
 #include "core/common/logging/logging.h"
diff --git a/onnxruntime/core/graph/graph_viewer.cc b/onnxruntime/core/graph/graph_viewer.cc
index 27473bd857a38..4beaf5243b077 100644
--- a/onnxruntime/core/graph/graph_viewer.cc
+++ b/onnxruntime/core/graph/graph_viewer.cc
@@ -6,7 +6,7 @@
 #pragma warning(disable : 4244)
 #endif
 
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 
 namespace onnxruntime {
 
diff --git a/onnxruntime/core/graph/identity_elimination.cc b/onnxruntime/core/graph/identity_elimination.cc
index 3e052cc127517..af9bf2c7be414 100644
--- a/onnxruntime/core/graph/identity_elimination.cc
+++ b/onnxruntime/core/graph/identity_elimination.cc
@@ -3,7 +3,7 @@
 
 #include "core/graph/rewrite_rule.h"
 #include "core/graph/identity_elimination.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/op.h"
 #include "core/common/logging/logging.h"
 
diff --git a/onnxruntime/core/graph/model.h b/onnxruntime/core/graph/model.h
index 110d74a1faf11..f7e510fe3438b 100644
--- a/onnxruntime/core/graph/model.h
+++ b/onnxruntime/core/graph/model.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <climits>
 #include <string>
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 
 #include "gsl/pointers"
 
diff --git a/onnxruntime/core/providers/cuda/cuda_common.h b/onnxruntime/core/providers/cuda/cuda_common.h
index 0fc1e30d5cf42..e8b440058413c 100644
--- a/onnxruntime/core/providers/cuda/cuda_common.h
+++ b/onnxruntime/core/providers/cuda/cuda_common.h
@@ -5,7 +5,7 @@
 #include "cuda_pch.h"
 #include "core/common/status.h"
 #include "core/framework/op_kernel.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "shared_inc/cuda_call.h"
 #include "cuda_execution_provider.h"
 #include "shared_inc/fast_divmod.h"
diff --git a/onnxruntime/core/session/inference_session.cc b/onnxruntime/core/session/inference_session.cc
index 6178e7810c562..04056b568e622 100644
--- a/onnxruntime/core/session/inference_session.cc
+++ b/onnxruntime/core/session/inference_session.cc
@@ -11,7 +11,7 @@
 
 #include "core/common/logging/logging.h"
 #include "core/common/task_thread_pool.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/graph_transformer.h"
 #include "core/graph/graph_transformer_mgr.h"
 #include "core/graph/model.h"
diff --git a/onnxruntime/python/onnxruntime_pybind_state.cc b/onnxruntime/python/onnxruntime_pybind_state.cc
index d1889afd8f7e6..4a60a28dcb261 100644
--- a/onnxruntime/python/onnxruntime_pybind_state.cc
+++ b/onnxruntime/python/onnxruntime_pybind_state.cc
@@ -7,7 +7,7 @@
 #define PY_ARRAY_UNIQUE_SYMBOL onnxruntime_python_ARRAY_API
 #include <numpy/arrayobject.h>
 
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 
 #if USE_CUDA
 #define BACKEND_PROC "GPU"
diff --git a/onnxruntime/test/framework/cuda/fence_cuda_test.cc b/onnxruntime/test/framework/cuda/fence_cuda_test.cc
index 94eba12275398..133e9efde4692 100644
--- a/onnxruntime/test/framework/cuda/fence_cuda_test.cc
+++ b/onnxruntime/test/framework/cuda/fence_cuda_test.cc
@@ -13,7 +13,7 @@
 #include "core/framework/execution_provider.h"
 #include "core/framework/op_kernel.h"
 #include "core/framework/session_state.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/graph/op.h"
 #include "core/providers/cuda/cuda_execution_provider.h"
diff --git a/onnxruntime/test/framework/float_16_test.cc b/onnxruntime/test/framework/float_16_test.cc
index 7ddf63532dffc..0be65ea0b2f16 100644
--- a/onnxruntime/test/framework/float_16_test.cc
+++ b/onnxruntime/test/framework/float_16_test.cc
@@ -12,7 +12,7 @@
 #include "core/framework/execution_provider.h"
 #include "core/framework/op_kernel.h"
 #include "core/framework/session_state.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/graph/op.h"
 #include "core/providers/cpu/cpu_execution_provider.h"
diff --git a/onnxruntime/test/framework/inference_session_test.cc b/onnxruntime/test/framework/inference_session_test.cc
index e83dcaddeb1a8..b3d9b461db44b 100644
--- a/onnxruntime/test/framework/inference_session_test.cc
+++ b/onnxruntime/test/framework/inference_session_test.cc
@@ -15,7 +15,7 @@
 #include "core/framework/kernel_registry.h"
 #include "core/framework/op_kernel.h"
 #include "core/framework/session_state.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/framework/computation_capacity.h"
 #include "core/graph/model.h"
 #include "core/graph/op.h"
diff --git a/onnxruntime/test/framework/local_kernel_registry_test.cc b/onnxruntime/test/framework/local_kernel_registry_test.cc
index 300d4bb266a5b..1066ce6c0e0f7 100644
--- a/onnxruntime/test/framework/local_kernel_registry_test.cc
+++ b/onnxruntime/test/framework/local_kernel_registry_test.cc
@@ -12,7 +12,7 @@
 #include "core/framework/execution_provider.h"
 #include "core/framework/op_kernel.h"
 #include "core/framework/session_state.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/graph/op.h"
 #include "core/providers/cpu/cpu_execution_provider.h"
diff --git a/onnxruntime/test/framework/op_kernel_test.cc b/onnxruntime/test/framework/op_kernel_test.cc
index b20933d3a3d1a..15dc19e63375a 100644
--- a/onnxruntime/test/framework/op_kernel_test.cc
+++ b/onnxruntime/test/framework/op_kernel_test.cc
@@ -4,7 +4,7 @@
 #include "core/session/inference_session.h"
 #include "core/framework/op_kernel.h"
 #include "core/framework/session_state.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/graph/op.h"
 #include "core/providers/cpu/cpu_execution_provider.h"
diff --git a/onnxruntime/test/framework/opaque_kernels_test.cc b/onnxruntime/test/framework/opaque_kernels_test.cc
index 51e5d88d904aa..03348ec6fdb9c 100644
--- a/onnxruntime/test/framework/opaque_kernels_test.cc
+++ b/onnxruntime/test/framework/opaque_kernels_test.cc
@@ -7,7 +7,7 @@
 #include "core/framework/execution_providers.h"
 #include "core/framework/op_kernel.h"
 #include "core/framework/session_state.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/graph/op.h"
 #include "core/providers/cpu/cpu_execution_provider.h"
diff --git a/onnxruntime/test/framework/session_state_test.cc b/onnxruntime/test/framework/session_state_test.cc
index 8fb8515a4efab..3304636940629 100644
--- a/onnxruntime/test/framework/session_state_test.cc
+++ b/onnxruntime/test/framework/session_state_test.cc
@@ -6,7 +6,7 @@
 #include "core/framework/execution_providers.h"
 #include "core/framework/op_kernel.h"
 #include "core/framework/session_state.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/graph/op.h"
 #include "core/providers/cpu/cpu_execution_provider.h"
diff --git a/onnxruntime/test/ir/graph_test.cc b/onnxruntime/test/ir/graph_test.cc
index 3f0bfda92c71b..445d044ef1f40 100644
--- a/onnxruntime/test/ir/graph_test.cc
+++ b/onnxruntime/test/ir/graph_test.cc
@@ -18,7 +18,7 @@
 #else
 #pragma GCC diagnostic pop
 #endif
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/graph/op.h"
 #include "gtest/gtest.h"
diff --git a/onnxruntime/test/ir/graph_transform_test.cc b/onnxruntime/test/ir/graph_transform_test.cc
index 365e92eb3f822..be6a3b6b06953 100644
--- a/onnxruntime/test/ir/graph_transform_test.cc
+++ b/onnxruntime/test/ir/graph_transform_test.cc
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "core/session/inference_session.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/graph/graph_transformer.h"
 #include "core/graph/identity_elimination.h"
diff --git a/onnxruntime/test/ir/onnx_model_test.cc b/onnxruntime/test/ir/onnx_model_test.cc
index dfbc75c05dd49..7939fadf8eac5 100644
--- a/onnxruntime/test/ir/onnx_model_test.cc
+++ b/onnxruntime/test/ir/onnx_model_test.cc
@@ -4,7 +4,7 @@
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 #include <memory>
 #include "core/platform/env.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/graph/op.h"
 #include "gtest/gtest.h"
diff --git a/onnxruntime/test/perftest/performance_runner.cc b/onnxruntime/test/perftest/performance_runner.cc
index 7bd09070683d6..5c467e65fc66e 100644
--- a/onnxruntime/test/perftest/performance_runner.cc
+++ b/onnxruntime/test/perftest/performance_runner.cc
@@ -7,7 +7,7 @@
 #ifdef _MSC_VER
 #include <filesystem>
 #endif
-#include "core/graph/graph.h"  //for onnxruntime::NodeArg
+#include "core/graph/graph_viewer.h"  //for onnxruntime::NodeArg
 #include "utils.h"
 #include "testenv.h"
 #include "providers.h"
diff --git a/onnxruntime/test/providers/provider_test_utils.h b/onnxruntime/test/providers/provider_test_utils.h
index 7c6abcebcce68..064971431e0d0 100644
--- a/onnxruntime/test/providers/provider_test_utils.h
+++ b/onnxruntime/test/providers/provider_test_utils.h
@@ -11,7 +11,7 @@
 #include "core/framework/run_options.h"
 #include "core/framework/session_state.h"
 #include "core/framework/tensor.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/graph/model.h"
 #include "core/framework/data_types.h"
 #include "test/test_environment.h"
diff --git a/onnxruntime/test/tvm/tvm_basic_test.cc b/onnxruntime/test/tvm/tvm_basic_test.cc
index 5d6e96643d650..c266535b2d41c 100644
--- a/onnxruntime/test/tvm/tvm_basic_test.cc
+++ b/onnxruntime/test/tvm/tvm_basic_test.cc
@@ -6,7 +6,7 @@
 #include "core/codegen/tvm/tvm_kernel.h"
 #include "core/framework/execution_provider.h"
 #include "core/framework/computation_capacity.h"
-#include "core/graph/graph.h"
+#include "core/graph/graph_viewer.h"
 #include "core/providers/cpu/cpu_execution_provider.h"
 #include "core/session/inference_session.h"
 #include "core/common/logging/logging.h"