diff --git a/xformer/.bazelrc b/xformer/.bazelrc
index 06697fc69..fa3b54793 100644
--- a/xformer/.bazelrc
+++ b/xformer/.bazelrc
@@ -75,8 +75,8 @@ build:windows --features=compiler_param_file
 build:windows --features=archive_param_file
 
 build:windows --enable_runfiles
-build:windows --linkopt=/FORCE:MULTIPLE
-build:windows --host_linkopt=/FORCE:MULTIPLE
+# build:windows --linkopt=/FORCE:MULTIPLE
+# build:windows --host_linkopt=/FORCE:MULTIPLE
 
 # Link with these libs only on macos
 build:macos --linkopt=-framework
diff --git a/xformer/BUILD b/xformer/BUILD
index 88a24feae..0695fe906 100644
--- a/xformer/BUILD
+++ b/xformer/BUILD
@@ -248,20 +248,13 @@ cc_binary(
     name = "xcore-opt",
     srcs = ["XCoreOptMain.cpp",
         "Version.h",
-        "@org_tensorflow//tensorflow/lite/kernels:padding.h",
-        "@org_tensorflow//tensorflow/lite/kernels/internal:reference/pooling.h",
-        "@org_tensorflow//tensorflow/lite/kernels/internal:reference/integer_ops/pooling.h",
-        "@org_tensorflow//tensorflow/lite/c:common.h",
-        "@org_tensorflow//tensorflow/lite/c:builtin_op_data.h",
-        "@org_tensorflow//tensorflow/lite/c:c_api_types.h",
+        # "@org_tensorflow//tensorflow/lite/kernels:padding.h",
+        # "@org_tensorflow//tensorflow/lite/kernels/internal:reference/pooling.h",
+        # "@org_tensorflow//tensorflow/lite/kernels/internal:reference/integer_ops/pooling.h",
+        # "@org_tensorflow//tensorflow/lite/c:common.h",
+        # "@org_tensorflow//tensorflow/lite/c:builtin_op_data.h",
+        # "@org_tensorflow//tensorflow/lite/c:c_api_types.h",
     ],
-    # Tensorflow and tflite-micro contain common tflite files in global namespace.
-    # Tell the compiler to allow multiple definitions when linking this.
-    linkopts = select({
-        "@org_tensorflow//tensorflow:macos": [],
-        "@org_tensorflow//tensorflow:windows": [],
-        "//conditions:default": ["-Wl,-z,muldefs"],
-    }),
     deps = [
         "@lib_tflite_micro//:shared_headers",
         "@lib_tflmc//:tflmc_lib",
diff --git a/xformer/lib_tflmc.BUILD b/xformer/lib_tflmc.BUILD
index 139f7ee57..3a6f90370 100644
--- a/xformer/lib_tflmc.BUILD
+++ b/xformer/lib_tflmc.BUILD
@@ -5,7 +5,9 @@ package(
 filegroup(
     name = "TFLITE_SOURCES",
     srcs = [
+        "@tflite_micro//tensorflow/lite:array.cc",
         "@tflite_micro//tensorflow/lite/core/c:common.cc",
+        "@tflite_micro//tensorflow/lite/kernels/internal:common.cc",
         "@tflite_micro//tensorflow/lite/core/api:error_reporter.cc",
         "@tflite_micro//tensorflow/lite/core/api:tensor_utils.cc",
         "@tflite_micro//tensorflow/lite/core/api:flatbuffer_conversions.cc",