diff --git a/CHANGELOG.md b/CHANGELOG.md
index e25d699743d..5cac839942b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - Add `sent_at` to envelope header (#2859)
 
+### Fixes
+
+- Fix import of `User` & `Breadcrumb` (#3017)
+
 ## 8.7.0
 
 ### Features
diff --git a/Sources/Sentry/include/HybridPublic/SentryBreadcrumb+Private.h b/Sources/Sentry/include/HybridPublic/SentryBreadcrumb+Private.h
index e369b1b22e1..db805b20d1c 100644
--- a/Sources/Sentry/include/HybridPublic/SentryBreadcrumb+Private.h
+++ b/Sources/Sentry/include/HybridPublic/SentryBreadcrumb+Private.h
@@ -1,6 +1,6 @@
+#import "SentryBreadcrumb.h"
 #import "SentryDefines.h"
 #import "SentrySerializable.h"
-#import <SentryBreadcrumb.h>
 
 @interface
 SentryBreadcrumb (Private)
diff --git a/Sources/Sentry/include/HybridPublic/SentryUser+Private.h b/Sources/Sentry/include/HybridPublic/SentryUser+Private.h
index db192bfcb92..8c6e1076697 100644
--- a/Sources/Sentry/include/HybridPublic/SentryUser+Private.h
+++ b/Sources/Sentry/include/HybridPublic/SentryUser+Private.h
@@ -1,6 +1,6 @@
 #import "SentryDefines.h"
 #import "SentrySerializable.h"
-#import <SentryUser.h>
+#import "SentryUser.h"
 
 @interface
 SentryUser (Private)