diff --git a/lib/api/capi.cpp b/lib/api/capi.cpp
index 916c4ebda..6125cd68c 100644
--- a/lib/api/capi.cpp
+++ b/lib/api/capi.cpp
@@ -49,7 +49,7 @@ capi_client * MAT::capi_get_client(evt_handle_t handle)
 /// <summary>
 /// Remove C API handle from active client tracking struct.
 /// </summary>
-void remove_client(evt_handle_t handle)
+static void remove_client(evt_handle_t handle)
 {
     LOCKGUARD(mtx);
     clients.erase(handle);
@@ -66,7 +66,7 @@ void remove_client(evt_handle_t handle)
         return ENOENT;                                          \
     };
 
-evt_status_t mat_open_core(
+static evt_status_t mat_open_core(
     evt_context_t *ctx,
     const char* config,
     http_send_fn_t httpSendFn,
@@ -175,7 +175,7 @@ evt_status_t mat_open_core(
     return ctx->result;
 }
 
-evt_status_t mat_open(evt_context_t *ctx)
+static evt_status_t mat_open(evt_context_t *ctx)
 {
     if (ctx == nullptr)
     {
@@ -186,7 +186,7 @@ evt_status_t mat_open(evt_context_t *ctx)
     return mat_open_core(ctx, config, nullptr, nullptr, nullptr, nullptr, nullptr);
 }
 
-evt_status_t mat_open_with_params(evt_context_t *ctx)
+static evt_status_t mat_open_with_params(evt_context_t *ctx)
 {
     if (ctx == nullptr)
     {
@@ -233,7 +233,7 @@ evt_status_t mat_open_with_params(evt_context_t *ctx)
 /**
  * Marashal C struct to C++ API
  */
-evt_status_t mat_log(evt_context_t *ctx)
+static evt_status_t mat_log(evt_context_t *ctx)
 {
     VERIFY_CLIENT_HANDLE(client, ctx);
 
@@ -285,7 +285,7 @@ evt_status_t mat_log(evt_context_t *ctx)
     return ctx->result;
 }
 
-evt_status_t mat_close(evt_context_t *ctx)
+static evt_status_t mat_close(evt_context_t *ctx)
 {
     VERIFY_CLIENT_HANDLE(client, ctx);
     const auto result = static_cast<evt_status_t>(LogManagerProvider::Release(client->logmanager->GetLogConfiguration()));
@@ -305,7 +305,7 @@ evt_status_t mat_close(evt_context_t *ctx)
     return result;
 }
 
-evt_status_t mat_pause(evt_context_t *ctx)
+static evt_status_t mat_pause(evt_context_t *ctx)
 {
     VERIFY_CLIENT_HANDLE(client, ctx);
     const auto result = static_cast<evt_status_t>(client->logmanager->PauseTransmission());
@@ -313,7 +313,7 @@ evt_status_t mat_pause(evt_context_t *ctx)
     return result;
 }
 
-evt_status_t mat_resume(evt_context_t *ctx)
+static evt_status_t mat_resume(evt_context_t *ctx)
 {
     VERIFY_CLIENT_HANDLE(client, ctx);
     const auto result = static_cast<evt_status_t>(client->logmanager->ResumeTransmission());
@@ -321,7 +321,7 @@ evt_status_t mat_resume(evt_context_t *ctx)
     return result;
 }
 
-evt_status_t mat_upload(evt_context_t *ctx)
+static evt_status_t mat_upload(evt_context_t *ctx)
 {
     VERIFY_CLIENT_HANDLE(client, ctx);
     const auto result = static_cast<evt_status_t>(client->logmanager->UploadNow());
@@ -329,7 +329,7 @@ evt_status_t mat_upload(evt_context_t *ctx)
     return result;
 }
 
-evt_status_t mat_flushAndTeardown(evt_context_t *ctx)
+static evt_status_t mat_flushAndTeardown(evt_context_t *ctx)
 {
     VERIFY_CLIENT_HANDLE(client, ctx);
     client->logmanager->FlushAndTeardown();
diff --git a/lib/http/HttpClient_Android.hpp b/lib/http/HttpClient_Android.hpp
index ad7905eca..4a2839c7e 100644
--- a/lib/http/HttpClient_Android.hpp
+++ b/lib/http/HttpClient_Android.hpp
@@ -12,7 +12,7 @@
 
 namespace MAT_NS_BEGIN
 {
-    class HttpClient_Android : public IHttpClient
+    class HttpClient_Android final : public IHttpClient
     {
         enum class RequestState : int8_t
         {
diff --git a/lib/http/HttpClient_Apple.hpp b/lib/http/HttpClient_Apple.hpp
index e9b22b1f0..a98eee238 100644
--- a/lib/http/HttpClient_Apple.hpp
+++ b/lib/http/HttpClient_Apple.hpp
@@ -13,7 +13,7 @@
 
 namespace MAT_NS_BEGIN {
 
-    class HttpClient_Apple : public IHttpClient {
+    class HttpClient_Apple final : public IHttpClient {
     public:
         HttpClient_Apple();
         virtual ~HttpClient_Apple() noexcept;
diff --git a/lib/http/HttpClient_CAPI.hpp b/lib/http/HttpClient_CAPI.hpp
index 5fb3cc088..61af911e8 100644
--- a/lib/http/HttpClient_CAPI.hpp
+++ b/lib/http/HttpClient_CAPI.hpp
@@ -13,7 +13,7 @@
 
 namespace MAT_NS_BEGIN {
 
-    class HttpClient_CAPI : public IHttpClient {
+    class HttpClient_CAPI final : public IHttpClient {
     public:
         HttpClient_CAPI(http_send_fn_t sendFn, http_cancel_fn_t cancelFn);
 
diff --git a/lib/http/HttpClient_Curl.hpp b/lib/http/HttpClient_Curl.hpp
index b1bb5344c..b441c7449 100644
--- a/lib/http/HttpClient_Curl.hpp
+++ b/lib/http/HttpClient_Curl.hpp
@@ -47,7 +47,7 @@ namespace MAT_NS_BEGIN {
 /**
  * Curl-based HTTP client
  */
-class HttpClient_Curl : public IHttpClient {
+class HttpClient_Curl final : public IHttpClient {
 public:
     HttpClient_Curl();
     virtual ~HttpClient_Curl();
diff --git a/lib/http/HttpClient_WinInet.hpp b/lib/http/HttpClient_WinInet.hpp
index 7e9379ded..77fd34a48 100644
--- a/lib/http/HttpClient_WinInet.hpp
+++ b/lib/http/HttpClient_WinInet.hpp
@@ -20,7 +20,7 @@ typedef void* HINTERNET;
 
 class WinInetRequestWrapper;
 
-class HttpClient_WinInet : public IHttpClient {
+class HttpClient_WinInet final : public IHttpClient {
   public:
     // Common IHttpClient methods
     HttpClient_WinInet();
diff --git a/lib/http/HttpClient_WinRt.hpp b/lib/http/HttpClient_WinRt.hpp
index e6352a45b..d6916e617 100644
--- a/lib/http/HttpClient_WinRt.hpp
+++ b/lib/http/HttpClient_WinRt.hpp
@@ -28,7 +28,7 @@ namespace MAT_NS_BEGIN {
 
 class WinRtRequestWrapper;
 
-class HttpClient_WinRt : public IHttpClient {
+class HttpClient_WinRt final : public IHttpClient {
   public:
     HttpClient_WinRt();
     virtual ~HttpClient_WinRt();
diff --git a/lib/offline/MemoryStorage.hpp b/lib/offline/MemoryStorage.hpp
index 8a378dc5d..64f3f7b8c 100644
--- a/lib/offline/MemoryStorage.hpp
+++ b/lib/offline/MemoryStorage.hpp
@@ -24,7 +24,7 @@
 
 namespace MAT_NS_BEGIN {
 
-    class MemoryStorage : public IOfflineStorage
+    class MemoryStorage final : public IOfflineStorage
     {
 
     public:
diff --git a/lib/offline/OfflineStorageHandler.hpp b/lib/offline/OfflineStorageHandler.hpp
index e7bdce4cb..c32de9ad8 100644
--- a/lib/offline/OfflineStorageHandler.hpp
+++ b/lib/offline/OfflineStorageHandler.hpp
@@ -23,7 +23,7 @@
 
 namespace MAT_NS_BEGIN {
 
-    class OfflineStorageHandler : public IOfflineStorage, public IOfflineStorageObserver
+    class OfflineStorageHandler final : public IOfflineStorage, public IOfflineStorageObserver
     {
     public:
         OfflineStorageHandler(ILogManager& logManager, IRuntimeConfig& runtimeConfig, ITaskDispatcher& taskDispatcher);
diff --git a/lib/offline/OfflineStorage_Room.hpp b/lib/offline/OfflineStorage_Room.hpp
index 71eee31b5..4cb194f09 100644
--- a/lib/offline/OfflineStorage_Room.hpp
+++ b/lib/offline/OfflineStorage_Room.hpp
@@ -23,7 +23,7 @@
 
 namespace MAT_NS_BEGIN
 {
-    class OfflineStorage_Room : public IOfflineStorage
+    class OfflineStorage_Room final : public IOfflineStorage
     {
        protected:
         class ConnectedEnv
diff --git a/lib/shared/dllmain.cpp b/lib/shared/dllmain.cpp
index 4cfa868c6..d584c56c6 100644
--- a/lib/shared/dllmain.cpp
+++ b/lib/shared/dllmain.cpp
@@ -18,7 +18,7 @@
 #ifdef _MANAGED
 #pragma unmanaged
 #endif
-unsigned thread_count = 0;
+static unsigned thread_count = 0;
 
 BOOL APIENTRY DllMain(HMODULE /* hModule */, DWORD ul_reason_for_call, LPVOID /* lpReserved */)
 {