🔧 Build error - use of undeclared identifier 'ToNativeArrayBuffer'; did you mean 'NativeArrayBuffer'?

[XChikuX]

How were you trying to build the app?

Before you read any further, I am on windows and build through expo eas. Unfortunately cannot build the example app without setting up a full eas envionment for it at the moment.

---

So after the recent update my build started failing.

I run eas build --platform ios --profile production

My runs used to work

Core issue from fastlane build logs (I'll include the full logs as well):

› Compiling react-native-quick-crypto Pods/QuickCrypto » ncrypto.cc
› Compiling react-native-quick-crypto Pods/QuickCrypto » XSalsa20Cipher.cpp
› Compiling react-native-quick-crypto Pods/QuickCrypto » QuickCryptoAutolinking.mm
› Compiling react-native-quick-crypto Pods/QuickCrypto » QuickCrypto-Swift-Cxx-Bridge.cpp
› Compiling react-native-quick-crypto Pods/QuickCrypto » OCBCipher.cpp
› Compiling react-native-quick-crypto Pods/QuickCrypto » KeyObjectData.cpp
    Run script build phase '[CP-User] [Hermes] Replace Hermes for the right configuration, if needed' will be run during every build because it does not specify any outputs. To address this issue, either add output dependencies to the script phase, or configure it to run in every build by unchecking "Based on dependency analysis" in the script phase. (in target 'hermes-engine' from project 'Pods')
    Run script build phase 'Remove signature files (Xcode workaround)' will be run during every build because it does not specify any outputs. To address this issue, either add output dependencies to the script phase, or configure it to run in every build by unchecking "Based on dependency analysis" in the script phase. (in target 'Test' from project 'Test')
▸ ** ARCHIVE FAILED **
▸ The following build commands failed:
▸ 	CompileC /Users/expo/Library/Developer/Xcode/DerivedData/Test-cdximgweapuvtehhjdnjpsbhkuxv/Build/Intermediates.noindex/ArchiveIntermediates/Test/IntermediateBuildFilesPath/Pods.build/Release-iphoneos/QuickCrypto.build/Objects-normal/arm64/XSalsa20Cipher.o /Users/expo/workingdir/build/node_modules/react-native-quick-crypto/cpp/cipher/XSalsa20Cipher.cpp normal arm64 c++ com.apple.compilers.llvm.clang.1_0.compiler (in target 'QuickCrypto' from project 'Pods')

From expo fail job logs:

Build failed: The "Run fastlane" step failed because of an error in the Xcode build process. We automatically detected following errors in your Xcode build logs:
- instead [-Wdeprecated-declarations]
- instead", macosx(10.2,10.14), ios(2.0,12.0), watchos(2.0,5.0), tvos(9.0,12.0));
- instead [-Wdeprecated-declarations]
- instead", macosx(10.2,10.14), ios(2.0,12.0), watchos(2.0,5.0), tvos(9.0,12.0));
- use of undeclared identifier 'ToNativeArrayBuffer'; did you mean 'NativeArrayBuffer'?
- use of undeclared identifier 'ToNativeArrayBuffer'; did you mean 'NativeArrayBuffer'?
- use of undeclared identifier 'ToNativeArrayBuffer'; did you mean 'NativeArrayBuffer'?
Refer to "Xcode Logs" below for additional, more detailed logs.

I checked XSalsa20Cipher.cpp file and noticed the ToNativeArrayBuffer() function. The file has not been modified in 6 months which lead me to believe this is a conflict with a 3rd party package.

So I git reset --hard <last_working_ios_build_commit_id> and re-ran the build and still encountered the issue.

You can see the same version number being built on expo (note, it's one trivial commit away)

However, even that failed. So now, I'm at a loss for what to do. Not at all sure where the error is originating.

Full build logs

✔ Push Notifications are set up

Compressing project files and uploading to EAS Build. Learn more: https://expo.fyi/eas-build-archive
✔ Compressed project files 5s (13.1 MB)
✔ Uploaded to EAS 4s
⌛️ Computing the project fingerprint is taking longer than expected...
⏩ To skip this step, set the environment variable: EAS_SKIP_AUTO_FINGERPRINT=1
✔ Computed project fingerprint

See logs: https://expo.dev/accounts/xchikux/projects/thedatingclub/builds/9cdd14c4-ca1e-4bd0-a331-5e059e2db311

Waiting for build to complete. You can press Ctrl+C to exit.
✖ Build failed

🍏 iOS build failed:
The "Run fastlane" step failed because of an error in the Xcode build process. We automatically detected following errors in your Xcode build logs:
- instead [-Wdeprecated-declarations]
- instead", macosx(10.2,10.14), ios(2.0,12.0), watchos(2.0,5.0), tvos(9.0,12.0));
- instead [-Wdeprecated-declarations]
- instead", macosx(10.2,10.14), ios(2.0,12.0), watchos(2.0,5.0), tvos(9.0,12.0));
- use of undeclared identifier 'ToNativeArrayBuffer'; did you mean 'NativeArrayBuffer'?
- use of undeclared identifier 'ToNativeArrayBuffer'; did you mean 'NativeArrayBuffer'?
- use of undeclared identifier 'ToNativeArrayBuffer'; did you mean 'NativeArrayBuffer'?
Refer to "Xcode Logs" below for additional, more detailed logs.

Project dependencies

"dependencies": {
    "@adrianso/react-native-device-brightness": "^1.2.7",
    "@apollo/client": "~4.0.9",
    "@craftzdog/react-native-buffer": "^6.1.1",
    "@maplibre/maplibre-react-native": "^10.4.0",
    "@notifee/react-native": "^9.1.8",
    "@op-engineering/op-sqlite": "^15.0.7",
    "@qonversion/react-native-sdk": "^10.0.0",
    "@react-native-community/datetimepicker": "8.5.0",
    "@react-native-masked-view/masked-view": "0.3.2",
    "@react-navigation/bottom-tabs": "^7.8.4",
    "@react-navigation/drawer": "^7.7.2",
    "@react-navigation/native": "^7.1.19",
    "@react-navigation/native-stack": "^7.6.2",
    "@shopify/flash-list": "^2.2.0",
    "@shopify/react-native-skia": "^2.3.0",
    "@tamagui/animations-moti": "~1.138.0",
    "@tamagui/babel-plugin": "~1.138.0",
    "@tamagui/config": "~1.138.0",
    "@tamagui/shorthands": "~1.138.0",
    "@tamagui/themes": "~1.138.0",
    "@tamagui/toast": "~1.138.0",
    "apollo-upload-client": "^19.0.0",
    "babel-plugin-react-compiler": "1.0.0",
    "burnt": "^0.13.0", 
    "events": "3.3.0",
    "expo": "~54.0.23",
    "expo-application": "~7.0.7",
    "expo-asset": "~12.0.9",
    "expo-audio": "~1.0.14",
    "expo-background-task": "~1.0.8",
    "expo-battery": "~10.0.7",
    "expo-blur": "~15.0.7",
    "expo-calendar": "~15.0.7",
    "expo-cellular": "~8.0.7",
    "expo-check-installed-apps": "^0.2.9",
    "expo-clipboard": "~8.0.7",
    "expo-constants": "~18.0.10",
    "expo-contacts": "~15.0.10",
    "expo-device": "~8.0.9",
    "expo-file-system": "~19.0.17",
    "expo-font": "~14.0.9",
    "expo-haptics": "~15.0.7",
    "expo-image": "~3.0.10",
    "expo-image-manipulator": "~14.0.7",
    "expo-image-picker": "~17.0.8",
    "expo-insights": "^0.10.7",
    "expo-linear-gradient": "~15.0.7",
    "expo-linking": "~8.0.8",
    "expo-live-photo": "~1.0.7",
    "expo-local-authentication": "~17.0.7",
    "expo-localization": "~17.0.7",
    "expo-location": "~19.0.7",
    "expo-network": "~8.0.7",
    "expo-notifications": "~0.32.12",
    "expo-plugin-ios-static-libraries": "^1.0.4",
    "expo-quick-actions": "5.0.0",
    "expo-random": "^14.0.1",
    "expo-screen-capture": "~8.0.8",
    "expo-secure-store": "~15.0.7",
    "expo-sensors": "~15.0.7",
    "expo-sharing": "~14.0.7",
    "expo-sms": "~14.0.7",
    "expo-splash-screen": "~31.0.10",
    "expo-store-review": "~9.0.8",
    "expo-system-ui": "~6.0.8",
    "expo-task-manager": "~14.0.8",
    "expo-tracking-transparency": "~6.0.7",
    "exponential-backoff": "^3.1.3",
    "graphql": "^16.12.0",
    "jotai": "^2.15",
    "lottie-react-native": "^7.3.4",
    "mime-db": "^1.54.0",
    "moti": "^0.30.0",
    "patch-package": "^8.0.1",
    "posthog-react-native": "4.7.1",
    "react": "19.1.0",
    "react-compiler-runtime": "1.0.0",
    "react-dom": "19.1.0",
    "react-native": "~0.81.5",
    "react-native-animated-glow": "^3.0.1",
    "react-native-animated-splash-screen": "2.0.5",
    "react-native-collapsible": "^1.6.2",
    "react-native-compressor": "1.13.0", 
    "react-native-device-country": "^1.1.1",
    "react-native-edge-to-edge": "^1.7.0",
    "react-native-element-dropdown": "^2.12.4",
    "react-native-fast-tflite": "^1.6.1",
    "react-native-gesture-handler": "~2.28.0",
    "react-native-keyboard-aware-scroll-view": "0.9.5",
    "react-native-material-ripple": "^0.9.1",
    "react-native-mmkv": "^4",
    "react-native-modal": "^14.0.0-rc.1",
    "react-native-nitro-modules": "0.31.6",
    "react-native-otp-entry": "^1.8.5",
    "react-native-pager-view": "^6.9.1",
    "react-native-quick-base64": "^2.2.2",
    "react-native-quick-crypto": "^1.0.0-beta.20",
    "react-native-radar": "~3.22.0",
    "react-native-reanimated": "~4.1.5",
    "react-native-reanimated-carousel": "^4.0.3",
    "react-native-safe-area-context": "~5.6.2",
    "react-native-screens": "^4.18.0",
    "react-native-share": "^12.2.0",
    "react-native-svg": "15.14.0",
    "react-native-svg-transformer": "^1.5.1",
    "react-native-swiper-flatlist": "^3.2.5",
    "react-native-unistyles": "^3.0.17",
    "react-native-vision-camera": "~4.7.3",
    "react-native-vision-camera-face-detector": "1.8.8",
    "react-native-web": "^0.21.2",
    "react-native-webview": "^13.16.0",
    "react-native-worklets": "^0.6.1",
    "react-native-worklets-core": "^1.6.2",
    "readable-stream": "^4.7.0",
    "rive-react-native": "^9.7.0",
    "rn-swiper-list": "^3.0.0",
    "rxjs": "^7.8.2",
    "tamagui": "~1.138.0",
    "victory-native": "37.3.6",
    "zustand": "^5.0.8"
  },

QuickCrypto Version

1.0.0-beta.21

Target platforms

iOS

Operating system

Windows, Linux

Can you build the QuickCrypto Example app?

No, I cannot build the Example app either

Additional information

• I am using Expo
• I have read the Troubleshooting Guide
• I agree to follow this project's Code of Conduct
• I searched for similar issues in this repository and found none.

[boorad]

hmm, I don't have many thoughts here. The only thing I can think of is that something happened to your includes setup?

#include "Utils.hpp"

That is what all of the ToNativeArrayBuffer() calls include, so make sure packages/react-native-quick-crypto/cpp/utils is an include...

[mlecoq]

I have the same issue with version 1.0.3, in

XSalsa20Cipher.cpp:14:21 Use of undeclared identifier 'ToNativeArrayBuffer'; did you mean 'NativeArrayBuffer'?

[mlecoq]

I had to patch the lib to replace import with relative paths

diff --git a/cpp/blake3/HybridBlake3.cpp b/cpp/blake3/HybridBlake3.cpp
index 69a6b87fe07420b726c285674bb536143aa5a6cb..d5d35a5a1dc82d7942cd18f02849f214485621ee 100644
--- a/cpp/blake3/HybridBlake3.cpp
+++ b/cpp/blake3/HybridBlake3.cpp
@@ -4,7 +4,7 @@
 #include <cstring>
 #include <stdexcept>
 
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
diff --git a/cpp/cipher/CCMCipher.cpp b/cpp/cipher/CCMCipher.cpp
index 0482797ec3c2e622a6e5915f3d06bb6f08596052..ec8d8f5b9755f478face8ceab5159b7af39c0767 100644
--- a/cpp/cipher/CCMCipher.cpp
+++ b/cpp/cipher/CCMCipher.cpp
@@ -1,5 +1,5 @@
 #include "CCMCipher.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <stdexcept>
diff --git a/cpp/cipher/ChaCha20Cipher.cpp b/cpp/cipher/ChaCha20Cipher.cpp
index b4b7280fa56e6d411a5ef097dbb60a1195b11411..4c860fbf18279e0516ca4a486c201c6bbd710b45 100644
--- a/cpp/cipher/ChaCha20Cipher.cpp
+++ b/cpp/cipher/ChaCha20Cipher.cpp
@@ -1,5 +1,5 @@
 #include "ChaCha20Cipher.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <stdexcept>
diff --git a/cpp/cipher/ChaCha20Poly1305Cipher.cpp b/cpp/cipher/ChaCha20Poly1305Cipher.cpp
index d1db2a39e27b31a314b4db3bcdc734b39f1b939d..a449f5beee09887bc5a483cf7aae8f6f69052598 100644
--- a/cpp/cipher/ChaCha20Poly1305Cipher.cpp
+++ b/cpp/cipher/ChaCha20Poly1305Cipher.cpp
@@ -1,5 +1,5 @@
 #include "ChaCha20Poly1305Cipher.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <stdexcept>
diff --git a/cpp/cipher/GCMCipher.cpp b/cpp/cipher/GCMCipher.cpp
index 676ba980c623434f4eac15fc75cbcac7c49a6405..ae30d22176b4ef45dc7e60117171463d83ee5430 100644
--- a/cpp/cipher/GCMCipher.cpp
+++ b/cpp/cipher/GCMCipher.cpp
@@ -1,5 +1,5 @@
 #include "GCMCipher.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <stdexcept>
diff --git a/cpp/cipher/HybridCipher.cpp b/cpp/cipher/HybridCipher.cpp
index 72d7dd18202260dcc328da4f6bc347ab2b2fdf81..c26b30bb33f4734145cd1c9a9fa4c57989088823 100644
--- a/cpp/cipher/HybridCipher.cpp
+++ b/cpp/cipher/HybridCipher.cpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "HybridCipher.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
diff --git a/cpp/cipher/HybridCipherFactory.hpp b/cpp/cipher/HybridCipherFactory.hpp
index d094adc71038eac84a18b48ee2fcc67a85f48c4c..cde647040cea056ad2e7c575b11e7b8b86a83134 100644
--- a/cpp/cipher/HybridCipherFactory.hpp
+++ b/cpp/cipher/HybridCipherFactory.hpp
@@ -10,7 +10,7 @@
 #include "GCMCipher.hpp"
 #include "HybridCipherFactorySpec.hpp"
 #include "OCBCipher.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 #include "XSalsa20Cipher.hpp"
 
 namespace margelo::nitro::crypto {
diff --git a/cpp/cipher/HybridRsaCipher.cpp b/cpp/cipher/HybridRsaCipher.cpp
index 3314e12fc8f588daba71bdfaa6b48d57d29b8d21..f8e91ea8b16c56a13d2606f5e51f8b8094c8f863 100644
--- a/cpp/cipher/HybridRsaCipher.cpp
+++ b/cpp/cipher/HybridRsaCipher.cpp
@@ -1,6 +1,6 @@
 #include "HybridRsaCipher.hpp"
 #include "../keys/HybridKeyObjectHandle.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 #include <cstring>
 #include <openssl/err.h>
diff --git a/cpp/cipher/OCBCipher.cpp b/cpp/cipher/OCBCipher.cpp
index d97322bceffd3c0507889aa457c01621b46c6594..4015000bedc6f2b42a1fede218a57821733360f6 100644
--- a/cpp/cipher/OCBCipher.cpp
+++ b/cpp/cipher/OCBCipher.cpp
@@ -3,7 +3,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 #include <cstdio>
 #include <iomanip>
 
diff --git a/cpp/cipher/XSalsa20Cipher.cpp b/cpp/cipher/XSalsa20Cipher.cpp
index f857846b4356499938f772ec8eb5a22870de8ed3..a83d1268296031d9df5f8dbe137a76511eedce25 100644
--- a/cpp/cipher/XSalsa20Cipher.cpp
+++ b/cpp/cipher/XSalsa20Cipher.cpp
@@ -2,7 +2,7 @@
 #include <stdexcept> // For std::runtime_error
 
 #include "NitroModules/ArrayBuffer.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 #include "XSalsa20Cipher.hpp"
 
 namespace margelo::nitro::crypto {
diff --git a/cpp/ec/HybridEcKeyPair.cpp b/cpp/ec/HybridEcKeyPair.cpp
index b0855e1e93eae917e3e610eaafb835572c2e23b6..edc485b1d5eb51a1b26e8870c3560b0c3df09bad 100644
--- a/cpp/ec/HybridEcKeyPair.cpp
+++ b/cpp/ec/HybridEcKeyPair.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #include "HybridEcKeyPair.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
diff --git a/cpp/ec/HybridEcKeyPair.hpp b/cpp/ec/HybridEcKeyPair.hpp
index ba4a1bccbec4b6acdbebfdd379eccde2d2d63785..3286d8d5f0c0239c4de94d49bdba8beabde6776c 100644
--- a/cpp/ec/HybridEcKeyPair.hpp
+++ b/cpp/ec/HybridEcKeyPair.hpp
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "HybridEcKeyPairSpec.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
diff --git a/cpp/ed25519/HybridEdKeyPair.hpp b/cpp/ed25519/HybridEdKeyPair.hpp
index 4c32d3ff2b0c25781c522abd9185380edebba4fc..cd0d6dc38dd7df84c306eea2a5f969d399f7b148 100644
--- a/cpp/ed25519/HybridEdKeyPair.hpp
+++ b/cpp/ed25519/HybridEdKeyPair.hpp
@@ -4,7 +4,7 @@
 #include <string>
 
 #include "HybridEdKeyPairSpec.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
diff --git a/cpp/hash/HybridHash.cpp b/cpp/hash/HybridHash.cpp
index 307c2374f99e67809275b15d8223f05eaf97ad11..6b81a46b7519b1ec3b0cca5fe5ec45b6a1be3caf 100644
--- a/cpp/hash/HybridHash.cpp
+++ b/cpp/hash/HybridHash.cpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "HybridHash.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
diff --git a/cpp/hkdf/HybridHkdf.cpp b/cpp/hkdf/HybridHkdf.cpp
index e6f3426a6464ea68a130006b7313be05c637e3e9..ab861fe9f21b55c1ad15db457a555ef718d9f74d 100644
--- a/cpp/hkdf/HybridHkdf.cpp
+++ b/cpp/hkdf/HybridHkdf.cpp
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "HybridHkdf.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
diff --git a/cpp/keys/HybridKeyObjectHandle.cpp b/cpp/keys/HybridKeyObjectHandle.cpp
index 6498246d928db6f4d805595e6c91f7221a2a51c8..2b7097e397a42a556bbd67d4ba7e1edcd9a34140 100644
--- a/cpp/keys/HybridKeyObjectHandle.cpp
+++ b/cpp/keys/HybridKeyObjectHandle.cpp
@@ -3,7 +3,7 @@
 
 #include "../utils/base64.h"
 #include "HybridKeyObjectHandle.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/evp.h>
diff --git a/cpp/keys/KeyObjectData.cpp b/cpp/keys/KeyObjectData.cpp
index d746f6632bfe568a518e74baa135dce0f56a30d6..519bcf308cc500cadc42c680e28fe3408c82a376 100644
--- a/cpp/keys/KeyObjectData.cpp
+++ b/cpp/keys/KeyObjectData.cpp
@@ -1,5 +1,5 @@
 #include "KeyObjectData.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 #include <cstdio>
 #include <optional>
 
diff --git a/cpp/keys/KeyObjectData.hpp b/cpp/keys/KeyObjectData.hpp
index 392d8a534a7688503a541dbe1f448fa5c02d01c1..44bb2fd2375f38f6193d367b891b329e6efbe917 100644
--- a/cpp/keys/KeyObjectData.hpp
+++ b/cpp/keys/KeyObjectData.hpp
@@ -5,7 +5,7 @@
 #include "KFormatType.hpp"
 #include "KeyEncoding.hpp"
 #include "KeyType.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 #include <ncrypto.h>
 
 namespace margelo::nitro::crypto {
diff --git a/cpp/mldsa/HybridMlDsaKeyPair.cpp b/cpp/mldsa/HybridMlDsaKeyPair.cpp
index ec64112714038cd5a1d2270040c17cc5a1449d49..86f425065de8944f49dd3bc5d46a78ec51eb47f6 100644
--- a/cpp/mldsa/HybridMlDsaKeyPair.cpp
+++ b/cpp/mldsa/HybridMlDsaKeyPair.cpp
@@ -5,7 +5,7 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 #if OPENSSL_VERSION_NUMBER >= 0x30500000L
 #define RNQC_HAS_ML_DSA 1
diff --git a/cpp/pbkdf2/HybridPbkdf2.cpp b/cpp/pbkdf2/HybridPbkdf2.cpp
index 4d68776c4c0ea5dead682c9e2440b6acbd1ca815..bc2201b3243357a16ce99f51c08b949c939006dc 100644
--- a/cpp/pbkdf2/HybridPbkdf2.cpp
+++ b/cpp/pbkdf2/HybridPbkdf2.cpp
@@ -1,5 +1,5 @@
 #include "HybridPbkdf2.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
diff --git a/cpp/random/HybridRandom.cpp b/cpp/random/HybridRandom.cpp
index 1e45982db13568924d4eea9557f447f1878cdab4..31c08d18f34c690ca42eff1bff4ed015da47df77 100644
--- a/cpp/random/HybridRandom.cpp
+++ b/cpp/random/HybridRandom.cpp
@@ -2,7 +2,7 @@
 #include <openssl/rand.h>
 
 #include "HybridRandom.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
diff --git a/cpp/rsa/HybridRsaKeyPair.cpp b/cpp/rsa/HybridRsaKeyPair.cpp
index df7b75a00ac3457c8e6eb34bb5acc423e5c8caf8..0566c0099d7187e3b0426946f5c8b88a1aca6fa8 100644
--- a/cpp/rsa/HybridRsaKeyPair.cpp
+++ b/cpp/rsa/HybridRsaKeyPair.cpp
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "HybridRsaKeyPair.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
diff --git a/cpp/scrypt/HybridScrypt.cpp b/cpp/scrypt/HybridScrypt.cpp
index ca1ba0ab50e4ce6cd59f1fc37e30e8d331ee3d69..c82139dd2bad2f15373542fb566f3a2321828a7a 100644
--- a/cpp/scrypt/HybridScrypt.cpp
+++ b/cpp/scrypt/HybridScrypt.cpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "HybridScrypt.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 
diff --git a/cpp/sign/HybridSignHandle.cpp b/cpp/sign/HybridSignHandle.cpp
index c81a4a4e275cb4362c2907f87488484f988734bb..96a19fa3d852784811803a0557fb13ae2ad3b09b 100644
--- a/cpp/sign/HybridSignHandle.cpp
+++ b/cpp/sign/HybridSignHandle.cpp
@@ -2,7 +2,7 @@
 
 #include "../keys/HybridKeyObjectHandle.hpp"
 #include "SignUtils.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 #include <cstring>
 #include <openssl/err.h>
diff --git a/cpp/sign/HybridVerifyHandle.cpp b/cpp/sign/HybridVerifyHandle.cpp
index 524c3af1044b98827ec19b8d41390b9feb880918..d572f663386489d01e6746376d8c8b2bc375b5cf 100644
--- a/cpp/sign/HybridVerifyHandle.cpp
+++ b/cpp/sign/HybridVerifyHandle.cpp
@@ -2,7 +2,7 @@
 
 #include "../keys/HybridKeyObjectHandle.hpp"
 #include "SignUtils.hpp"
-#include "Utils.hpp"
+#include "../utils/Utils.hpp"
 
 #include <cstring>
 #include <openssl/err.h>

[boorad]

How do you set your include folders on Windows? That might have been easier than this extensive patch.