1 files changed, 24 insertions, 24 deletions

diff --git a/plugins/signal-protocol/vapi/signal-protocol-native.vapi b/plugins/signal-protocol/vapi/signal-protocol-native.vapi
index b9ba6a31..ed391020 100644
--- a/plugins/signal-protocol/vapi/signal-protocol-native.vapi
+++ b/plugins/signal-protocol/vapi/signal-protocol-native.vapi
@@ -1,6 +1,6 @@
 namespace Signal {
     [Compact]
-    [CCode (cname = "signal_context", cprefix="signal_context_", free_function="signal_context_destroy", cheader_filename = "signal_protocol.h")]
+    [CCode (cname = "signal_context", cprefix="signal_context_", free_function="signal_context_destroy", cheader_filename = "signal/signal_protocol.h")]
     public class NativeContext {
         public static int create(out NativeContext context, void* user_data);
         public int set_crypto_provider(NativeCryptoProvider crypto_provider);
@@ -13,7 +13,7 @@ namespace Signal {
     public delegate void LogFunc(LogLevel level, string message, void* user_data);
 
     [Compact]
-    [CCode (cname = "signal_crypto_provider", cheader_filename = "signal_protocol.h")]
+    [CCode (cname = "signal_crypto_provider", cheader_filename = "signal/signal_protocol.h")]
     public struct NativeCryptoProvider {
         public RandomFunc random_func;
         public HmacSha256Init hmac_sha256_init_func;
@@ -50,7 +50,7 @@ namespace Signal {
     public delegate int CryptFunc(out Buffer output, Cipher cipher, uint8[] key, uint8[] iv, uint8[] content, void* user_data);
 
     [Compact]
-    [CCode (cname = "signal_protocol_session_store", cheader_filename = "signal_protocol.h")]
+    [CCode (cname = "signal_protocol_session_store", cheader_filename = "signal/signal_protocol.h")]
     public struct NativeSessionStore {
         public LoadSessionFunc load_session_func;
         public GetSubDeviceSessionsFunc get_sub_device_sessions_func;
@@ -75,7 +75,7 @@ namespace Signal {
     public delegate int DeleteAllSessionsFunc(char[] name, void* user_data);
 
     [Compact]
-    [CCode (cname = "signal_protocol_identity_key_store", cheader_filename = "signal_protocol.h")]
+    [CCode (cname = "signal_protocol_identity_key_store", cheader_filename = "signal/signal_protocol.h")]
     public struct NativeIdentityKeyStore {
         GetIdentityKeyPairFunc get_identity_key_pair;
         GetLocalRegistrationIdFunc get_local_registration_id;
@@ -94,7 +94,7 @@ namespace Signal {
     public delegate int IsTrustedIdentityFunc(Address address, uint8[] key, void* user_data);
 
     [Compact]
-    [CCode (cname = "signal_protocol_pre_key_store", cheader_filename = "signal_protocol.h")]
+    [CCode (cname = "signal_protocol_pre_key_store", cheader_filename = "signal/signal_protocol.h")]
     public struct NativePreKeyStore {
         LoadPreKeyFunc load_pre_key;
         StorePreKeyFunc store_pre_key;
@@ -114,7 +114,7 @@ namespace Signal {
 
 
     [Compact]
-    [CCode (cname = "signal_protocol_signed_pre_key_store", cheader_filename = "signal_protocol.h")]
+    [CCode (cname = "signal_protocol_signed_pre_key_store", cheader_filename = "signal/signal_protocol.h")]
     public struct NativeSignedPreKeyStore {
         LoadPreKeyFunc load_signed_pre_key;
         StorePreKeyFunc store_signed_pre_key;
@@ -142,7 +142,7 @@ namespace Signal {
     public delegate int DestroyFunc(void* user_data);
 
     [Compact]
-    [CCode (cname = "signal_protocol_store_context", cprefix = "signal_protocol_store_context_", free_function="signal_protocol_store_context_destroy", cheader_filename = "signal_protocol.h")]
+    [CCode (cname = "signal_protocol_store_context", cprefix = "signal_protocol_store_context_", free_function="signal_protocol_store_context_destroy", cheader_filename = "signal/signal_protocol.h")]
     public class NativeStoreContext {
         public static int create(out NativeStoreContext context, NativeContext global_context);
         public int set_session_store(NativeSessionStore store);
@@ -153,7 +153,7 @@ namespace Signal {
     }
 
 
-    [CCode (cheader_filename = "signal_protocol.h")]
+    [CCode (cheader_filename = "signal/signal_protocol.h")]
     namespace Protocol {
 
         /**
@@ -201,7 +201,7 @@ namespace Signal {
             public int is_trusted_identity(NativeStoreContext store_context, Address address, ECPublicKey identity_key);
         }
 
-        [CCode (cheader_filename = "key_helper.h", cprefix = "signal_protocol_key_helper_")]
+        [CCode (cheader_filename = "signal/key_helper.h", cprefix = "signal_protocol_key_helper_")]
         namespace KeyHelper {
             [Compact]
             [CCode (cname = "signal_protocol_key_helper_pre_key_list_node", cprefix = "signal_protocol_key_helper_key_list_", free_function="signal_protocol_key_helper_key_list_free")]
@@ -222,7 +222,7 @@ namespace Signal {
         }
     }
 
-    [CCode (cheader_filename = "curve.h")]
+    [CCode (cheader_filename = "signal/curve.h")]
     namespace Curve {
         [CCode (cname = "curve_calculate_agreement")]
         public int calculate_agreement([CCode (array_length = false)] out uint8[] shared_key_data, ECPublicKey public_key, ECPrivateKey private_key);
@@ -232,35 +232,35 @@ namespace Signal {
         public int verify_signature(ECPublicKey signing_key, uint8[] message, uint8[] signature);
     }
 
-    [CCode (cname = "session_builder_create", cheader_filename = "session_builder.h")]
+    [CCode (cname = "session_builder_create", cheader_filename = "signal/session_builder.h")]
     public static int session_builder_create(out SessionBuilder builder, NativeStoreContext store, Address remote_address, NativeContext global_context);
-    [CCode (cname = "session_cipher_create", cheader_filename = "session_cipher.h")]
+    [CCode (cname = "session_cipher_create", cheader_filename = "signal/session_cipher.h")]
     public static int session_cipher_create(out SessionCipher cipher, NativeStoreContext store, Address remote_address, NativeContext global_context);
-    [CCode (cname = "pre_key_signal_message_deserialize", cheader_filename = "protocol.h")]
+    [CCode (cname = "pre_key_signal_message_deserialize", cheader_filename = "signal/protocol.h")]
     public static int pre_key_signal_message_deserialize(out PreKeySignalMessage message, uint8[] data, NativeContext global_context);
-    [CCode (cname = "pre_key_signal_message_copy", cheader_filename = "protocol.h")]
+    [CCode (cname = "pre_key_signal_message_copy", cheader_filename = "signal/protocol.h")]
     public static int pre_key_signal_message_copy(out PreKeySignalMessage message, PreKeySignalMessage other_message, NativeContext global_context);
-    [CCode (cname = "signal_message_create", cheader_filename = "protocol.h")]
+    [CCode (cname = "signal_message_create", cheader_filename = "signal/protocol.h")]
     public static int signal_message_create(out SignalMessage message, uint8 message_version, uint8[] mac_key, ECPublicKey sender_ratchet_key, uint32 counter, uint32 previous_counter, uint8[] ciphertext, ECPublicKey sender_identity_key, ECPublicKey receiver_identity_key, NativeContext global_context);
-    [CCode (cname = "signal_message_deserialize", cheader_filename = "protocol.h")]
+    [CCode (cname = "signal_message_deserialize", cheader_filename = "signal/protocol.h")]
     public static int signal_message_deserialize(out SignalMessage message, uint8[] data, NativeContext global_context);
-    [CCode (cname = "signal_message_copy", cheader_filename = "protocol.h")]
+    [CCode (cname = "signal_message_copy", cheader_filename = "signal/protocol.h")]
     public static int signal_message_copy(out SignalMessage message, SignalMessage other_message, NativeContext global_context);
-    [CCode (cname = "curve_generate_key_pair", cheader_filename = "curve.h")]
+    [CCode (cname = "curve_generate_key_pair", cheader_filename = "signal/curve.h")]
     public static int curve_generate_key_pair(NativeContext context, out ECKeyPair key_pair);
-    [CCode (cname = "curve_decode_private_point", cheader_filename = "curve.h")]
+    [CCode (cname = "curve_decode_private_point", cheader_filename = "signal/curve.h")]
     public static int curve_decode_private_point(out ECPrivateKey public_key, uint8[] key, NativeContext global_context);
-    [CCode (cname = "curve_decode_point", cheader_filename = "curve.h")]
+    [CCode (cname = "curve_decode_point", cheader_filename = "signal/curve.h")]
     public static int curve_decode_point(out ECPublicKey public_key, uint8[] key, NativeContext global_context);
-    [CCode (cname = "curve_generate_private_key", cheader_filename = "curve.h")]
+    [CCode (cname = "curve_generate_private_key", cheader_filename = "signal/curve.h")]
     public static int curve_generate_private_key(NativeContext context, out ECPrivateKey private_key);
-    [CCode (cname = "ratchet_identity_key_pair_deserialize", cheader_filename = "ratchet.h")]
+    [CCode (cname = "ratchet_identity_key_pair_deserialize", cheader_filename = "signal/ratchet.h")]
     public static int ratchet_identity_key_pair_deserialize(out IdentityKeyPair key_pair, uint8[] data, NativeContext global_context);
-    [CCode (cname = "session_signed_pre_key_deserialize", cheader_filename = "signed_pre_key.h")]
+    [CCode (cname = "session_signed_pre_key_deserialize", cheader_filename = "signal/signed_pre_key.h")]
     public static int session_signed_pre_key_deserialize(out SignedPreKeyRecord pre_key, uint8[] data, NativeContext global_context);
 
     [Compact]
-    [CCode (cname = "hkdf_context", cprefix = "hkdf_", free_function = "hkdf_destroy", cheader_filename = "hkdf.h")]
+    [CCode (cname = "hkdf_context", cprefix = "hkdf_", free_function = "hkdf_destroy", cheader_filename = "signal/hkdf.h")]
     public class NativeHkdfContext {
         public static int create(out NativeHkdfContext context, int message_version, NativeContext global_context);
         public int compare(NativeHkdfContext other);