diff --git a/configure.ac b/configure.ac
index d64eabb64676..75340b956d47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,8 @@ AM_PATH_PYTHON3
 AX_CODE_COVERAGE
 AX_ADD_AM_MACRO_STATIC([])
 
-AM_CONDITIONAL(sonic_asic_platform_barefoot,   test x$CONFIGURED_PLATFORM = xbarefoot)
-AM_CONDITIONAL(sonic_asic_platform_mellanox,   test x$CONFIGURED_PLATFORM = xmellanox)
+AM_CONDITIONAL(SONIC_ASIC_PLATFORM_BAREFOOT,   test x$CONFIGURED_PLATFORM = xbarefoot)
+AM_CONDITIONAL(SONIC_ASIC_PLATFORM_MELLANOX,   test x$CONFIGURED_PLATFORM = xmellanox)
 
 AC_ARG_ENABLE(debug,
 [  --enable-debug          turn on debugging],
diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
index 9e3b045aec93..7633f1cfc427 100644
--- a/lib/src/Makefile.am
+++ b/lib/src/Makefile.am
@@ -1,7 +1,7 @@
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
+AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc
 
 if DEBUG
-DBGFLAGS = -ggdb -D_DEBUG_
+DBGFLAGS = -ggdb -DDEBUG
 else
 DBGFLAGS = -g
 endif
@@ -9,29 +9,30 @@ endif
 lib_LTLIBRARIES = libsairedis.la
 
 noinst_LIBRARIES = libSaiRedis.a
+
 libSaiRedis_a_SOURCES = \
+						 Channel.cpp \
 						 ClientConfig.cpp \
-						 ServerConfig.cpp \
-						 ClientServerSai.cpp \
 						 ClientSai.cpp \
-						 ServerSai.cpp \
-						 ZeroMQChannel.cpp \
-						 Channel.cpp \
+						 ClientServerSai.cpp \
 						 Context.cpp \
-						 ContextConfigContainer.cpp \
 						 ContextConfig.cpp \
-						 SwitchConfig.cpp \
-						 SwitchConfigContainer.cpp \
+						 ContextConfigContainer.cpp \
+						 Recorder.cpp \
 						 RedisChannel.cpp \
+						 RedisRemoteSaiInterface.cpp \
+						 RedisVidIndexGenerator.cpp \
 						 Sai.cpp \
+						 ServerConfig.cpp \
+						 ServerSai.cpp \
+						 SkipRecordAttrContainer.cpp \
 						 Switch.cpp \
+						 SwitchConfig.cpp \
+						 SwitchConfigContainer.cpp \
 						 SwitchContainer.cpp \
-						 VirtualObjectIdManager.cpp \
-						 RedisVidIndexGenerator.cpp \
-						 Recorder.cpp \
-						 RedisRemoteSaiInterface.cpp \
 						 Utils.cpp \
-						 SkipRecordAttrContainer.cpp
+						 VirtualObjectIdManager.cpp \
+						 ZeroMQChannel.cpp
 
 libsairedis_la_SOURCES = \
 						 sai_redis_acl.cpp \
@@ -88,11 +89,10 @@ libsairedis_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 libsairedis_la_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
 libsairedis_la_LIBADD = -lhiredis -lswsscommon libSaiRedis.a $(CODE_COVERAGE_LIBS)
 
-
 bin_PROGRAMS = tests
 
 tests_SOURCES = tests.cpp
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
-tests_LDADD = -lhiredis -lswsscommon -lpthread $(top_srcdir)/meta/libsaimetadata.la $(top_srcdir)/meta/libsaimeta.la libsairedis.la -lzmq
+tests_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq
 
 TESTS = tests
diff --git a/meta/Makefile.am b/meta/Makefile.am
index 5ced50db91c8..4738d20ecd4e 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -1,9 +1,8 @@
-# since we have SAI sumbodule we will use submodule headers
-AM_CFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/lib/inc
+AM_CFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta
+AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc
 
 if DEBUG
-DBGFLAGS = -ggdb -D_DEBUG_
+DBGFLAGS = -ggdb -DDEBUG
 else
 DBGFLAGS = -g
 endif
@@ -28,8 +27,11 @@ libsaimetadata_la_SOURCES =  \
 libsaimetadata_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 libsaimetadata_la_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) -ansi $(CODE_COVERAGE_CFLAGS)
 
-
 libsaimeta_la_SOURCES = \
+				AttrKeyMap.cpp \
+				Globals.cpp \
+				Meta.cpp \
+				MetaKeyHasher.cpp \
 				Notification.cpp \
 				NotificationFactory.cpp \
 				NotificationFdbEvent.cpp \
@@ -37,22 +39,18 @@ libsaimeta_la_SOURCES = \
 				NotificationQueuePfcDeadlock.cpp \
 				NotificationSwitchShutdownRequest.cpp \
 				NotificationSwitchStateChange.cpp \
-				SaiInterface.cpp \
-				SaiAttributeList.cpp \
-				saiserialize.cpp \
-				SaiAttrWrapper.cpp \
 				OidRefCounter.cpp \
-				AttrKeyMap.cpp \
-				Globals.cpp \
+				PerformanceIntervalTimer.cpp \
+				PortRelatedSet.cpp \
+				RedisSelectableChannel.cpp \
+				SaiAttrWrapper.cpp \
+				SaiAttributeList.cpp \
+				SaiInterface.cpp \
 				SaiObject.cpp \
 				SaiObjectCollection.cpp \
-				PortRelatedSet.cpp \
-				MetaKeyHasher.cpp \
-				PerformanceIntervalTimer.cpp \
 				SelectableChannel.cpp \
-				RedisSelectableChannel.cpp \
 				ZeroMQSelectableChannel.cpp \
-				Meta.cpp
+				saiserialize.cpp
 
 libsaimeta_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 libsaimeta_la_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
diff --git a/pyext/test.py b/pyext/test.py
index 52d0ea223ffd..3e0c0685cff9 100755
--- a/pyext/test.py
+++ b/pyext/test.py
@@ -105,7 +105,7 @@ def fdb_event_notification(count, data):
 pysairedis.sai_attribute_t_arr_setitem(attrs, 5, attr)
 
 status = switch_api.create_switch(poid, 6, attrs)
-print "create_switch: " + str(status) 
+print "create_switch: " + str(status)
 
 swid = pysairedis.sai_object_id_t_p_value(poid)
 
diff --git a/saiasiccmp/Makefile.am b/saiasiccmp/Makefile.am
index 66c6f5a6423c..9ac3d65cf082 100644
--- a/saiasiccmp/Makefile.am
+++ b/saiasiccmp/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/meta -I$(top_srcdir)/syncd
+AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/syncd
 
 bin_PROGRAMS = saiasiccmp
 
@@ -12,11 +12,11 @@ noinst_LIBRARIES = libAsicCmp.a
 
 libAsicCmp_a_SOURCES = \
 				AsicCmp.cpp \
-				View.cpp \
-				ViewCmp.cpp \
-				SaiSwitchAsic.cpp \
 				CommandLineOptions.cpp \
-				CommandLineOptionsParser.cpp
+				CommandLineOptionsParser.cpp \
+				SaiSwitchAsic.cpp \
+				View.cpp \
+				ViewCmp.cpp
 
 libAsicCmp_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 libAsicCmp_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
@@ -26,10 +26,9 @@ 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 \
-				   -L$(top_srcdir)/syncd/.libs \
 				   $(top_srcdir)/lib/src/libSaiRedis.a \
-				   -L$(top_srcdir)/meta/.libs \
 				   $(CODE_COVERAGE_LIBS)
 
 TESTS = test.sh
diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
index 5a7a60764a36..e6fdc00a6122 100644
--- a/saidiscovery/Makefile.am
+++ b/saidiscovery/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental -I${top_srcdir}/meta
+AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/meta -I$(top_srcdir)/lib/inc
 
 bin_PROGRAMS = saidiscovery
 
diff --git a/saidump/Makefile.am b/saidump/Makefile.am
index 57e5c165473a..d30719f08af7 100644
--- a/saidump/Makefile.am
+++ b/saidump/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
+AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc
 
 bin_PROGRAMS = saidump
 
diff --git a/saiplayer/Makefile.am b/saiplayer/Makefile.am
index a905f0836709..f19784c205f6 100644
--- a/saiplayer/Makefile.am
+++ b/saiplayer/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
+AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc
 
 bin_PROGRAMS = saiplayer
 
@@ -9,16 +9,17 @@ DBGFLAGS = -g
 endif
 
 noinst_LIBRARIES = libSaiPlayer.a
+
 libSaiPlayer_a_SOURCES = \
 						 CommandLineOptions.cpp \
 						 CommandLineOptionsParser.cpp \
 						 SaiPlayer.cpp
 
-
 libSaiPlayer_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 libSaiPlayer_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
 
 saiplayer_SOURCES = saiplayer_main.cpp
 saiplayer_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saiplayer_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-saiplayer_LDADD = libSaiPlayer.a $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
+saiplayer_LDADD =  libSaiPlayer.a $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a \
+				   -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am
index ccfad1db17cd..156dc32450a0 100644
--- a/saisdkdump/Makefile.am
+++ b/saisdkdump/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
+AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta
 
 bin_PROGRAMS = saisdkdump
 
@@ -8,7 +8,6 @@ else
 DBGFLAGS = -g
 endif
 
-
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
index 35acd1f9087d..07b0908b6bbf 100644
--- a/syncd/Makefile.am
+++ b/syncd/Makefile.am
@@ -1,6 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
-
-bin_PROGRAMS = syncd syncd_request_shutdown tests
+AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc
 
 if DEBUG
 DBGFLAGS = -ggdb -DDEBUG
@@ -14,48 +12,51 @@ else
 SAILIB=-lsai
 endif
 
+bin_PROGRAMS = syncd syncd_request_shutdown tests
+
 noinst_LIBRARIES = libSyncd.a libSyncdRequestShutdown.a
+
 libSyncd_a_SOURCES = \
-				WatchdogScope.cpp \
-				SaiSwitchInterface.cpp \
-				ZeroMQNotificationProducer.cpp \
-				RedisNotificationProducer.cpp \
-				ComparisonLogic.cpp \
-				Syncd.cpp \
+				AsicOperation.cpp \
+				AsicView.cpp \
+				BestCandidateFinder.cpp \
 				BreakConfig.cpp \
 				BreakConfigParser.cpp \
-				RedisClient.cpp \
-				WarmRestartTable.cpp \
-				RequestShutdownCommandLineOptions.cpp \
+				CommandLineOptions.cpp \
+				CommandLineOptionsParser.cpp \
+				ComparisonLogic.cpp \
+				FlexCounter.cpp \
+				FlexCounterManager.cpp \
 				GlobalSwitchId.cpp \
+				HardReiniter.cpp \
 				MetadataLogger.cpp \
-				Workaround.cpp \
-				ServiceMethodTable.cpp \
-				SwitchNotifications.cpp \
-				VirtualOidTranslator.cpp \
-				NotificationProcessor.cpp \
 				NotificationHandler.cpp \
-				SingleReiniter.cpp \
-				HardReiniter.cpp \
+				NotificationProcessor.cpp \
+				NotificationQueue.cpp \
+				PortMap.cpp \
+				PortMapParser.cpp \
+				RedisClient.cpp \
+				RedisNotificationProducer.cpp \
+				RequestShutdownCommandLineOptions.cpp \
+				SaiAttr.cpp \
 				SaiDiscovery.cpp \
+				SaiObj.cpp \
 				SaiSwitch.cpp \
-				BestCandidateFinder.cpp \
-				FlexCounterManager.cpp \
-				FlexCounter.cpp \
+				SaiSwitchInterface.cpp \
+				ServiceMethodTable.cpp \
+				SingleReiniter.cpp \
+				SwitchNotifications.cpp \
+				Syncd.cpp \
+				TimerWatchdog.cpp \
+				VendorSai.cpp \
 				VidManager.cpp \
 				VidManager.cpp \
-				AsicOperation.cpp \
-				AsicView.cpp \
-				SaiObj.cpp \
-				SaiAttr.cpp \
-				VendorSai.cpp \
-				syncd_main.cpp \
-				TimerWatchdog.cpp \
-				NotificationQueue.cpp \
-				CommandLineOptions.cpp \
-				CommandLineOptionsParser.cpp \
-				PortMap.cpp \
-				PortMapParser.cpp
+				VirtualOidTranslator.cpp \
+				WarmRestartTable.cpp \
+				WatchdogScope.cpp \
+				Workaround.cpp \
+				ZeroMQNotificationProducer.cpp \
+				syncd_main.cpp
 
 libSyncd_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 libSyncd_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
@@ -71,15 +72,15 @@ syncd_CXXFLAGS += -DSAITHRIFT=yes
 syncd_LDADD += -lrpcserver -lthrift
 endif
 
-if sonic_asic_platform_mellanox
+if SONIC_ASIC_PLATFORM_MELLANOX
 syncd_CXXFLAGS += -DSAI_SUXXORT_UNINIT_DATA_PLANE_ON_REMOVAL
 libSyncd_a_CXXFLAGS += -DSAI_SUXXORT_UNINIT_DATA_PLANE_ON_REMOVAL
 endif
 
 libSyncdRequestShutdown_a_SOURCES = \
-								 RequestShutdown.cpp \
-								 RequestShutdownCommandLineOptions.cpp \
-								 RequestShutdownCommandLineOptionsParser.cpp
+									RequestShutdown.cpp \
+									RequestShutdownCommandLineOptions.cpp \
+									RequestShutdownCommandLineOptionsParser.cpp
 
 libSyncdRequestShutdown_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 libSyncdRequestShutdown_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
@@ -90,7 +91,6 @@ syncd_request_shutdown_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
 syncd_request_shutdown_LDADD = libSyncdRequestShutdown.a $(top_srcdir)/lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread $(CODE_COVERAGE_LIBS)
 
 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)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4629bbad6913..5d11f80a15d0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
+AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc
 
 bin_PROGRAMS = vssyncd tests testclient
 
@@ -11,10 +11,11 @@ endif
 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
@@ -36,4 +37,4 @@ testclient_LDADD = -lhiredis -lswsscommon -lpthread \
 			  -L$(top_srcdir)/meta/.libs \
 			  -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
 
-TESTS = aspellcheck.pl conflictnames.pl swsslogentercheck.sh tests BCM56850.pl MLNX2700.pl
+TESTS = aspellcheck.pl conflictnames.pl swsslogentercheck.sh checkwhitespace.sh tests BCM56850.pl MLNX2700.pl
diff --git a/tests/checkwhitespace.sh b/tests/checkwhitespace.sh
new file mode 100755
index 000000000000..7932ed5b8b08
--- /dev/null
+++ b/tests/checkwhitespace.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+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\$"
+
+if [ $? -eq 0 ]; then
+    echo ERROR: some files contain white spaces at the end of line, please fix
+    exit 1
+fi
diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am
index 7181c92fa5d2..6997f7eaa4ce 100644
--- a/vslib/src/Makefile.am
+++ b/vslib/src/Makefile.am
@@ -1,7 +1,7 @@
-AM_CXXFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I/usr/include/libnl3 -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental 
+AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I/usr/include/libnl3
 
 if DEBUG
-DBGFLAGS = -ggdb -D_DEBUG_
+DBGFLAGS = -ggdb -DDEBUG
 else
 DBGFLAGS = -g
 endif
@@ -11,58 +11,58 @@ lib_LTLIBRARIES = libsaivs.la
 noinst_LIBRARIES = libSaiVS.a
 
 libSaiVS_a_SOURCES = \
-					  Context.cpp \
-					  ContextConfig.cpp \
+					  Buffer.cpp \
 					  ContextConfigContainer.cpp \
-					  ResourceLimiter.cpp \
-					  ResourceLimiterContainer.cpp \
-					  ResourceLimiterParser.cpp \
-					  EventPayloadNotification.cpp \
-					  EventPayloadNetLinkMsg.cpp \
-					  SaiEventQueue.cpp \
+					  ContextConfig.cpp \
+					  Context.cpp \
+					  CorePortIndexMapContainer.cpp \
+					  CorePortIndexMap.cpp \
+					  CorePortIndexMapFileParser.cpp \
 					  Event.cpp \
-					  EventQueue.cpp \
-					  Signal.cpp \
-					  Buffer.cpp \
+					  EventPayloadNetLinkMsg.cpp \
+					  EventPayloadNotification.cpp \
 					  EventPayloadPacket.cpp \
-					  VirtualSwitchSaiInterface.cpp \
-					  SaiFdbAging.cpp \
-					  SwitchConfigContainer.cpp \
-					  SwitchConfig.cpp \
-					  SaiUnittests.cpp \
-					  Sai.cpp \
-					  SwitchStateBaseFdb.cpp \
-					  SwitchStateBaseHostif.cpp \
+					  EventQueue.cpp \
+					  FdbInfo.cpp \
 					  HostInterfaceInfo.cpp \
-					  SwitchStateBase.cpp \
-					  NetMsgRegistrar.cpp \
-					  LaneMap.cpp \
 					  LaneMapContainer.cpp \
+					  LaneMap.cpp \
 					  LaneMapFileParser.cpp \
-					  VirtualSwitchSaiInterfacePort.cpp \
-					  VirtualSwitchSaiInterfaceFdb.cpp \
-					  Switch.cpp \
-					  FdbInfo.cpp \
-					  SwitchContainer.cpp \
+					  MACsecAttr.cpp \
+					  MACsecEgressFilter.cpp \
+					  MACsecFilter.cpp \
+					  MACsecForwarder.cpp \
+					  MACsecIngressFilter.cpp \
+					  MACsecManager.cpp \
+					  NetMsgRegistrar.cpp \
 					  RealObjectIdManager.cpp \
+					  ResourceLimiterContainer.cpp \
+					  ResourceLimiter.cpp \
+					  ResourceLimiterParser.cpp \
 					  SaiAttrWrap.cpp \
+					  Sai.cpp \
+					  SaiEventQueue.cpp \
+					  SaiFdbAging.cpp \
+					  SaiUnittests.cpp \
 					  SelectableFd.cpp \
-					  SwitchState.cpp \
+					  Signal.cpp \
 					  SwitchBCM56850.cpp \
 					  SwitchBCM81724.cpp \
+					  SwitchConfigContainer.cpp \
+					  SwitchConfig.cpp \
+					  SwitchContainer.cpp \
+					  Switch.cpp \
 					  SwitchMLNX2700.cpp \
-					  CorePortIndexMap.cpp \
-					  CorePortIndexMapContainer.cpp \
-					  CorePortIndexMapFileParser.cpp \
-					  MACsecFilter.cpp \
-					  MACsecEgressFilter.cpp \
-					  MACsecIngressFilter.cpp \
-					  TrafficForwarder.cpp \
-					  MACsecForwarder.cpp \
-					  TrafficFilterPipes.cpp \
+					  SwitchStateBase.cpp \
+					  SwitchStateBaseFdb.cpp \
+					  SwitchStateBaseHostif.cpp \
 					  SwitchStateBaseMACsec.cpp \
-					  MACsecAttr.cpp \
-					  MACsecManager.cpp
+					  SwitchState.cpp \
+					  TrafficFilterPipes.cpp \
+					  TrafficForwarder.cpp \
+					  VirtualSwitchSaiInterface.cpp \
+					  VirtualSwitchSaiInterfaceFdb.cpp \
+					  VirtualSwitchSaiInterfacePort.cpp
 
 libsaivs_la_SOURCES = \
 					  sai_vs_fdb.cpp \
@@ -124,6 +124,6 @@ bin_PROGRAMS = tests
 
 tests_SOURCES = tests.cpp
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
-tests_LDADD = -lhiredis -lswsscommon -lpthread libsaivs.la $(top_srcdir)/meta/libsaimetadata.la $(top_srcdir)/meta/libsaimeta.la -lzmq
+tests_LDADD = -lhiredis -lswsscommon -lpthread libsaivs.la -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq
 
 TESTS = tests