diff --git a/agent-ovs/lib/include/opflexagent/PrometheusManager.h b/agent-ovs/lib/include/opflexagent/PrometheusManager.h
index e288da815..e1e6d0286 100644
--- a/agent-ovs/lib/include/opflexagent/PrometheusManager.h
+++ b/agent-ovs/lib/include/opflexagent/PrometheusManager.h
@@ -510,7 +510,7 @@ class AgentPrometheusManager : private PrometheusManager {
      * Create MoDBCounts metric family if its not present.
      * Update MoDBCounts metric family if its already present
      *
-     * @param counts     contains total number of object counts
+     * @param pCounts    contains total number of object counts
      *                   in MoDB per object type
      */
     void addNUpdateMoDBCounts(shared_ptr<ModbCounts> pCounts);
diff --git a/agent-ovs/ovs/include/SpanRenderer.h b/agent-ovs/ovs/include/SpanRenderer.h
index 537fdc7bd..599e9404f 100644
--- a/agent-ovs/ovs/include/SpanRenderer.h
+++ b/agent-ovs/ovs/include/SpanRenderer.h
@@ -68,7 +68,6 @@ class SpanRenderer : public SpanListener,
     /**
      * deletes mirror session
      * @param[in] sessionName name of session
-     * @return true if success, false otherwise.
      */
     void deleteMirror(const string& sessionName);
 
diff --git a/agent-ovs/ovs/include/SwitchConnection.h b/agent-ovs/ovs/include/SwitchConnection.h
index 138c87bae..3adea9e64 100644
--- a/agent-ovs/ovs/include/SwitchConnection.h
+++ b/agent-ovs/ovs/include/SwitchConnection.h
@@ -17,6 +17,7 @@
 #include <mutex>
 #include <chrono>
 #include <atomic>
+#include <string>
 
 
 struct vconn;
diff --git a/libopflex/engine/OpflexPEHandler.cpp b/libopflex/engine/OpflexPEHandler.cpp
index d689b06ac..66074c0e6 100644
--- a/libopflex/engine/OpflexPEHandler.cpp
+++ b/libopflex/engine/OpflexPEHandler.cpp
@@ -155,7 +155,7 @@ void OpflexPEHandler::ready() {
               << "Handshake succeeded";
 
     setState(READY);
-    getProcessor()->connectionReady(getConnection());
+    getProcessor()->connectionReady((OpflexConnection*)getConnection());
 }
 
 static bool validateProxyAddress(const Value &val,
diff --git a/libopflex/engine/include/opflex/engine/internal/OpflexHandler.h b/libopflex/engine/include/opflex/engine/internal/OpflexHandler.h
index dfc544fff..effb3f21b 100644
--- a/libopflex/engine/include/opflex/engine/internal/OpflexHandler.h
+++ b/libopflex/engine/include/opflex/engine/internal/OpflexHandler.h
@@ -46,8 +46,6 @@ class OpflexHandler : public opflex::jsonrpc::JsonRpcHandler {
      */
     virtual ~OpflexHandler() {}
 
-    virtual OpflexConnection* getConnection() const { return (OpflexConnection*)conn; }
-
     // *************************
     // Protocol Message Handlers
     // *************************
diff --git a/libopflex/include/opflex/rpc/JsonRpcConnection.h b/libopflex/include/opflex/rpc/JsonRpcConnection.h
index 66878246f..7a8976665 100644
--- a/libopflex/include/opflex/rpc/JsonRpcConnection.h
+++ b/libopflex/include/opflex/rpc/JsonRpcConnection.h
@@ -16,6 +16,7 @@
 #ifndef RPC_JSONRPCCONNECTION_H
 #define RPC_JSONRPCCONNECTION_H
 
+#include <list>
 #include <mutex>
 #include <boost/noncopyable.hpp>