diff --git a/submodules/OpenSSLEncryptionProvider/Package.swift b/submodules/OpenSSLEncryptionProvider/Package.swift
index 1fd1668319..a8c920d7c8 100644
--- a/submodules/OpenSSLEncryptionProvider/Package.swift
+++ b/submodules/OpenSSLEncryptionProvider/Package.swift
@@ -23,10 +23,8 @@ let package = Package(
             publicHeadersPath: "PublicHeaders",
             cSettings: [
                 .headerSearchPath("PublicHeaders"),
-                .unsafeFlags([
-                    "-I../../../../core-xprojects/openssl/build/openssl/include",
-                    "-I../EncryptionProvider/PublicHeaders"
-                ])
+                .headerSearchPath("SharedHeaders/openssl/include"),
+                .headerSearchPath("SharedHeaders/EncryptionProvider"),
             ]),
     ]
 )
diff --git a/submodules/OpusBinding/Package.swift b/submodules/OpusBinding/Package.swift
index 12028015a3..045c0e30c3 100644
--- a/submodules/OpusBinding/Package.swift
+++ b/submodules/OpusBinding/Package.swift
@@ -28,8 +28,8 @@ let package = Package(
             cSettings: [
                 .headerSearchPath("PublicHeaders"),
                 .headerSearchPath("PublicHeaders/OpusBinding"),
+                .headerSearchPath("SharedHeaders/libopus/include"),
                 .headerSearchPath("Sources"),
-                .unsafeFlags(["-I../../../../core-xprojects/libopus/build/libopus/include"])
             ]),
     ]
 )