diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
--- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
+++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
@@ -3,18 +3,9 @@
 #include "Logger.h"
 #include "sqlite_orm.h"
 
-#include "entities/Media.h"
 #include "entities/Metadata.h"
-#include <sqlite3.h>
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
 #include <fstream>
 #include <iostream>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <system_error>
 #include <thread>
 
 #ifdef __ANDROID__
diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
--- a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
+++ b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
@@ -2,15 +2,9 @@
 #include "DatabaseManager.h"
 #include "GRPCStreamHostObject.h"
 #include "InternalModules/GlobalNetworkSingleton.h"
-#include "InternalModules/NetworkModule.h"
-#include "Logger.h"
 #include "MessageStoreOperations.h"
 #include "ThreadStoreOperations.h"
 
-#include <folly/Optional.h>
-
-#include "../DatabaseManagers/entities/Media.h"
-
 #include <ReactCommon/TurboModuleUtils.h>
 #include <future>