diff --git a/packages/isar/lib/src/native/bindings.dart b/packages/isar/lib/src/native/bindings.dart
index 9a2d090fa..28f949a76 100644
--- a/packages/isar/lib/src/native/bindings.dart
+++ b/packages/isar/lib/src/native/bindings.dart
@@ -1953,12 +1953,14 @@ final class CIsarValue extends ffi.Opaque {}
 final class CString extends ffi.Opaque {}
 
 typedef IsarI64 = ffi.Int64;
+typedef DartIsarI64 = int;
 
 final class CIsarQueryCursor extends ffi.Opaque {}
 
 final class CIsarUpdate extends ffi.Opaque {}
 
 typedef DartPort = ffi.Int64;
+typedef DartDartPort = int;
 
 final class CWatchHandle extends ffi.Opaque {}
 
diff --git a/packages/isar/lib/src/web/bindings.dart b/packages/isar/lib/src/web/bindings.dart
index 160bb878c..2e3369aa9 100644
--- a/packages/isar/lib/src/web/bindings.dart
+++ b/packages/isar/lib/src/web/bindings.dart
@@ -891,6 +891,7 @@ final class CIsarValue extends ffi.Opaque {}
 final class CString extends ffi.Opaque {}
 
 typedef IsarI64 = ffi.Int64;
+typedef DartIsarI64 = int;
 
 final class CIsarQueryCursor extends ffi.Opaque {}
 
@@ -899,6 +900,7 @@ final class CFilter extends ffi.Opaque {}
 final class CIsarUpdate extends ffi.Opaque {}
 
 typedef DartPort = ffi.Int64;
+typedef DartDartPort = int;
 
 final class CWatchHandle extends ffi.Opaque {}
 
diff --git a/packages/isar/pubspec.yaml b/packages/isar/pubspec.yaml
index 463a4c2ee..095cbaddf 100644
--- a/packages/isar/pubspec.yaml
+++ b/packages/isar/pubspec.yaml
@@ -23,10 +23,10 @@ dependencies:
   ffi: ">=2.0.0 <3.0.0"
   js: ^0.6.7
   meta: ^1.9.1
-  source_gen: ^1.4.0
+  source_gen: ^1.5.0
 
 dev_dependencies:
   build_test: ^2.2.0
-  ffigen: ^8.0.2
+  ffigen: ^10.0.0
   test: any
   very_good_analysis: ^5.0.0+1