diff --git a/mclagsyncd/mclaglink.h b/mclagsyncd/mclaglink.h
index e1b6ae5678b3..4a4e74dcdbe7 100644
--- a/mclagsyncd/mclaglink.h
+++ b/mclagsyncd/mclaglink.h
@@ -36,7 +36,6 @@
 
 #include "producerstatetable.h"
 #include "selectable.h"
-#include "redisclient.h"
 #include "mclagsyncd/mclag.h"
 
 namespace swss {
diff --git a/orchagent/bufferorch.h b/orchagent/bufferorch.h
index f19e2b432247..294501029c58 100644
--- a/orchagent/bufferorch.h
+++ b/orchagent/bufferorch.h
@@ -7,7 +7,6 @@
 #include "orch.h"
 #include "portsorch.h"
 #include "redisapi.h"
-#include "redisclient.h"
 
 #define BUFFER_POOL_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP "BUFFER_POOL_WATERMARK_STAT_COUNTER"
 
diff --git a/orchagent/countercheckorch.cpp b/orchagent/countercheckorch.cpp
index fe2865fc78c3..54d6c1a51cea 100644
--- a/orchagent/countercheckorch.cpp
+++ b/orchagent/countercheckorch.cpp
@@ -2,7 +2,6 @@
 #include "portsorch.h"
 #include "select.h"
 #include "notifier.h"
-#include "redisclient.h"
 #include "sai_serialize.h"
 #include <inttypes.h>
 
diff --git a/orchagent/flexcounterorch.cpp b/orchagent/flexcounterorch.cpp
index 549db87c9311..25dd95834e2b 100644
--- a/orchagent/flexcounterorch.cpp
+++ b/orchagent/flexcounterorch.cpp
@@ -3,7 +3,6 @@
 #include "portsorch.h"
 #include "select.h"
 #include "notifier.h"
-#include "redisclient.h"
 #include "sai_serialize.h"
 #include "pfcwdorch.h"
 #include "bufferorch.h"
diff --git a/orchagent/pfcwdorch.cpp b/orchagent/pfcwdorch.cpp
index af27fb7b879f..dad4ddd9310e 100644
--- a/orchagent/pfcwdorch.cpp
+++ b/orchagent/pfcwdorch.cpp
@@ -8,7 +8,6 @@
 #include "redisapi.h"
 #include "select.h"
 #include "notifier.h"
-#include "redisclient.h"
 #include "schema.h"
 #include "subscriberstatetable.h"
 
diff --git a/orchagent/pfcwdorch.h b/orchagent/pfcwdorch.h
index a86132fe4963..1f56d28c3a48 100644
--- a/orchagent/pfcwdorch.h
+++ b/orchagent/pfcwdorch.h
@@ -7,7 +7,6 @@
 #include "producertable.h"
 #include "notificationconsumer.h"
 #include "timer.h"
-#include "redisclient.h"
 
 extern "C" {
 #include "sai.h"
diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
index 7f06c73bf974..3a68dab4bf16 100755
--- a/orchagent/portsorch.cpp
+++ b/orchagent/portsorch.cpp
@@ -25,7 +25,6 @@
 #include "crmorch.h"
 #include "countercheckorch.h"
 #include "notifier.h"
-#include "redisclient.h"
 #include "fdborch.h"
 
 extern sai_switch_api_t *sai_switch_api;
diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp
index 629d08390aa2..ef34cc9b046a 100644
--- a/orchagent/routeorch.cpp
+++ b/orchagent/routeorch.cpp
@@ -596,7 +596,7 @@ void RouteOrch::doTask(Consumer& consumer)
                     else
                     {
                         if (addRoute(ctx, nhg))
-                             it = consumer.m_toSync.erase(it);
+                            it = consumer.m_toSync.erase(it);
                         else
                             it++;
                     }