diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
index 6bcc5c39ff7d..fd60fa1a4b0c 100644
--- a/saidiscovery/Makefile.am
+++ b/saidiscovery/Makefile.am
@@ -12,7 +12,8 @@ if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
 if sonic_asic_platform_barefoot
-SAILIB=-L/opt/bfn/install/lib -lswitchsai -lswitchapi -lbf_switchd_lib -ltofinopdfixed_thrift -ldriver -lbfutils -lbfsys -lbfutils -L/opt/bfn/install/lib/tofinopd/switch -lpd -lpdcli -lpdthrift
+AM_CPPFLAGS += -I/opt/bfn/install/include
+SAILIB=-L/opt/bfn/install/lib -lswitchsai
 else
 SAILIB=-lsai
 endif
diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am
index 486e5120b85f..eece1bc27773 100644
--- a/saisdkdump/Makefile.am
+++ b/saisdkdump/Makefile.am
@@ -13,7 +13,6 @@ if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
 if sonic_asic_platform_barefoot
-AM_LDFLAGS = -Wl,-unresolved-symbols=ignore-in-shared-libs
 SAILIB=-L/opt/bfn/install/lib -lswitchsai
 else
 SAILIB=-lsai
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
index 7384fb4cca47..9b3f6861e1da 100644
--- a/syncd/Makefile.am
+++ b/syncd/Makefile.am
@@ -13,7 +13,6 @@ SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
 if sonic_asic_platform_barefoot
 AM_CPPFLAGS += -I/opt/bfn/install/include
-AM_LDFLAGS = -Wl,-unresolved-symbols=ignore-in-shared-libs
 SAILIB=-L/opt/bfn/install/lib -lswitchsai
 else
 SAILIB=-lsai
diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
index 2eda075dfd7e..d68fdc4b5fbd 100755
--- a/syncd/scripts/syncd_init_common.sh
+++ b/syncd/scripts/syncd_init_common.sh
@@ -136,7 +136,6 @@ config_syncd_barefoot()
     export ONIE_PLATFORM=`grep onie_platform /etc/machine.conf | awk 'BEGIN { FS = "=" } ; { print $2 }'`
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib/platform/$ONIE_PLATFORM:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch
     ./opt/bfn/install/bin/dma_setup.sh
-    export LD_PRELOAD=libswitchapi.so:libswitchsai.so:libpd.so:libpdcli.so:libdriver.so:libbfsys.so:libbfutils.so:libbf_switchd_lib.so:libtofinopdfixed_thrift.so:libpdthrift.so
 }
 
 config_syncd_nephos()