diff --git a/include/onnxruntime/core/framework/kernel_def_builder.h b/include/onnxruntime/core/framework/kernel_def_builder.h
index fa71276e8b..0b3bfb00a3 100644
--- a/include/onnxruntime/core/framework/kernel_def_builder.h
+++ b/include/onnxruntime/core/framework/kernel_def_builder.h
@@ -180,6 +180,8 @@ class KernelDef {
 
 class KernelDefBuilder {
  public:
+  std::unique_ptr<KernelDefBuilder> Create() { return onnxruntime::make_unique<KernelDefBuilder>(); }
+
   explicit KernelDefBuilder()
       : kernel_def_(new KernelDef()) {}
 
diff --git a/onnxruntime/core/providers/shared_library/provider_api.h b/onnxruntime/core/providers/shared_library/provider_api.h
index e6949cb635..b24536c765 100644
--- a/onnxruntime/core/providers/shared_library/provider_api.h
+++ b/onnxruntime/core/providers/shared_library/provider_api.h
@@ -7,22 +7,7 @@
 //       switching providers to be runnable as shared libraries. The interfaces will become more tightly integrated into the core code.
 
 #pragma once
-#ifdef USE_ROCM
-#include <vector>
-#include <string>
-#include <map>
-#include <gsl/gsl>
-#include <unordered_map>
-#include <unordered_set>
-#include "onnx/common/stl_backports.h"
-#include "core/common/common.h"
-#include "core/framework/data_transfer.h"
-#include "core/framework/execution_provider.h"
-#include "core/framework/op_kernel.h"
-#include "core/framework/data_types_internal.h"
-#include "core/framework/tensorprotoutils.h"
-#include "core/providers/common.h"
-#else
+#ifndef USE_ROCM
 #define SHARED_PROVIDER 1
 
 #include <vector>