diff --git a/saiasiccmp/Makefile.am b/saiasiccmp/Makefile.am
index 156578c3babb..349f527bb25e 100644
--- a/saiasiccmp/Makefile.am
+++ b/saiasiccmp/Makefile.am
@@ -19,10 +19,7 @@ saiasiccmp_SOURCES = main.cpp
 saiasiccmp_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saiasiccmp_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
 saiasiccmp_LDADD = libAsicCmp.a \
-				   -lsaimetadata -lsaimeta -ldl -lhiredis -lswsscommon -lpthread -lzmq \
-				   -L$(top_srcdir)/meta/.libs \
-				   $(top_srcdir)/syncd/libSyncd.a \
-				   $(top_srcdir)/lib/src/libSaiRedis.a \
-				   $(CODE_COVERAGE_LIBS)
+				   -ldl -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq \
+				   $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a $(CODE_COVERAGE_LIBS)
 
 TESTS = test.sh
diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
index e724d3a78d41..79cb846b66ba 100644
--- a/saidiscovery/Makefile.am
+++ b/saidiscovery/Makefile.am
@@ -12,4 +12,5 @@ saidiscovery_SOURCES = saidiscovery.cpp
 
 saidiscovery_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saidiscovery_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-saidiscovery_LDADD = -lhiredis -lswsscommon $(top_srcdir)/syncd/libSyncd.a $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
+saidiscovery_LDADD = -lhiredis -lswsscommon $(top_srcdir)/syncd/libSyncd.a $(SAILIB) -lpthread \
+					 -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
diff --git a/saidump/Makefile.am b/saidump/Makefile.am
index b994cee7f704..134f8af2c27c 100644
--- a/saidump/Makefile.am
+++ b/saidump/Makefile.am
@@ -5,4 +5,5 @@ bin_PROGRAMS = saidump
 saidump_SOURCES = saidump.cpp
 saidump_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saidump_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-saidump_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -L$(top_srcdir)/lib/src/.libs -lsairedis -lzmq $(CODE_COVERAGE_LIBS)
+saidump_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \
+				-L$(top_srcdir)/lib/src/.libs -lsairedis -lzmq $(CODE_COVERAGE_LIBS)
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
index a96377e2d344..94715a8efa73 100644
--- a/syncd/Makefile.am
+++ b/syncd/Makefile.am
@@ -58,7 +58,8 @@ libSyncd_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVER
 syncd_SOURCES = main.cpp
 syncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 syncd_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-syncd_LDADD = libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lhiredis -lswsscommon $(SAILIB) -lpthread -lzmq $(CODE_COVERAGE_LIBS)
+syncd_LDADD = libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \
+			  -ldl -lhiredis -lswsscommon $(SAILIB) -lpthread -lzmq $(CODE_COVERAGE_LIBS)
 
 if SAITHRIFT
 libSyncd_a_CXXFLAGS += -DSAITHRIFT=yes
@@ -86,6 +87,7 @@ syncd_request_shutdown_LDADD = libSyncdRequestShutdown.a $(top_srcdir)/lib/src/l
 
 tests_SOURCES = tests.cpp
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
-tests_LDADD = libSyncd.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/lib/src/.libs -lsairedis -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
+tests_LDADD = libSyncd.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/lib/src/.libs -lsairedis \
+			  -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
 
 TESTS = tests
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6dc2ee95391f..6844a05a9632 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,9 +7,9 @@ SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 vssyncd_SOURCES = main.cpp
 vssyncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 vssyncd_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-vssyncd_LDADD =  $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a \
-				 -lhiredis -lswsscommon $(SAILIB) -lpthread \
-				 -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lzmq $(CODE_COVERAGE_LIBS)
+vssyncd_LDADD = $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a \
+				-lhiredis -lswsscommon $(SAILIB) -lpthread \
+				-L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lzmq $(CODE_COVERAGE_LIBS)
 
 if SAITHRIFT
 vssyncd_LDADD += -lrpcserver -lthrift
@@ -18,17 +18,13 @@ endif
 tests_SOURCES = tests.cpp
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
 tests_LDADD = -lhiredis -lswsscommon -lpthread \
-			  $(top_srcdir)/lib/src/libsairedis.la \
-			  $(top_srcdir)/syncd/libSyncd.a \
-			  -L$(top_srcdir)/meta/.libs \
-			  -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
+			  $(top_srcdir)/lib/src/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \
+			  -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
 
 testclient_SOURCES = testclient.cpp
 testclient_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
 testclient_LDADD = -lhiredis -lswsscommon -lpthread \
-			  $(top_srcdir)/lib/src/libsairedis.la \
-			  $(top_srcdir)/syncd/libSyncd.a \
-			  -L$(top_srcdir)/meta/.libs \
-			  -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
+				   $(top_srcdir)/lib/src/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \
+				   -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
 
 TESTS = aspellcheck.pl conflictnames.pl swsslogentercheck.sh checkwhitespace.sh tests BCM56850.pl MLNX2700.pl
diff --git a/tests/checkwhitespace.sh b/tests/checkwhitespace.sh
index 7932ed5b8b08..dffbf2239cd9 100755
--- a/tests/checkwhitespace.sh
+++ b/tests/checkwhitespace.sh
@@ -2,7 +2,7 @@
 
 echo Checkig for white spaces ...
 
-find .. -type f | grep -v SAI/ | perl -ne 'print if /\.(c|cpp|h|hpp|am|sh|pl|pm|install|dirs|links|json|ini|yml|pws|md|py|cfg|conf|i|ac)$/' | xargs grep -P "\\s\$"
+find .. -type f | grep -v SAI/ |grep -f _wrap.cpp| perl -ne 'print if /\.(c|cpp|h|hpp|am|sh|pl|pm|install|dirs|links|json|ini|yml|pws|md|py|cfg|conf|i|ac)$/' | xargs grep -P "\\s\$"
 
 if [ $? -eq 0 ]; then
     echo ERROR: some files contain white spaces at the end of line, please fix