diff --git a/Classes/BITAuthenticator.h b/Classes/BITAuthenticator.h
index 2a96e49e83..1653de788d 100644
--- a/Classes/BITAuthenticator.h
+++ b/Classes/BITAuthenticator.h
@@ -198,18 +198,6 @@ typedef NS_ENUM(NSUInteger, BITAuthenticatorAppRestrictionEnforcementFrequency)
  */
 @property (nonatomic, copy) NSString *authenticationSecret;
 
-/**
- Delegate that can be used to do any last minute configurations on the
- presented viewController.
- 
- The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
- should not need to set this delegate individually.
- 
- @see `[BITHockeyManager setDelegate:]`
- @see BITAuthenticatorDelegate
- */
-@property (nonatomic, weak) id<BITAuthenticatorDelegate> delegate;
-
 
 #pragma mark - Device based identification
 
diff --git a/Classes/BITAuthenticator_Private.h b/Classes/BITAuthenticator_Private.h
index 2836b92b5d..960279ade2 100644
--- a/Classes/BITAuthenticator_Private.h
+++ b/Classes/BITAuthenticator_Private.h
@@ -34,6 +34,18 @@
 
 @interface BITAuthenticator ()<BITAuthenticationViewControllerDelegate, UIAlertViewDelegate>
 
+/**
+ Delegate that can be used to do any last minute configurations on the
+ presented viewController.
+ 
+ The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
+ should not need to set this delegate individually.
+ 
+ @see `[BITHockeyManager setDelegate:]`
+ @see BITAuthenticatorDelegate
+ */
+@property (nonatomic, weak) id<BITAuthenticatorDelegate> delegate;
+
 /**
  * must be set
  */
diff --git a/Classes/BITCrashManager.h b/Classes/BITCrashManager.h
index a3dc213bc3..fdc8e2f2cc 100644
--- a/Classes/BITCrashManager.h
+++ b/Classes/BITCrashManager.h
@@ -157,21 +157,6 @@ typedef NS_ENUM(NSUInteger, BITCrashManagerUserInput) {
 @interface BITCrashManager : BITHockeyBaseManager
 
 
-///-----------------------------------------------------------------------------
-/// @name Delegate
-///-----------------------------------------------------------------------------
-
-/**
- Sets the optional `BITCrashManagerDelegate` delegate.
-
- The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
- should not need to set this delegate individually.
- 
- @see `[BITHockeyManager setDelegate:]`
- */
-@property (nonatomic, weak) id delegate;
-
-
 ///-----------------------------------------------------------------------------
 /// @name Configuration
 ///-----------------------------------------------------------------------------
diff --git a/Classes/BITCrashManagerPrivate.h b/Classes/BITCrashManagerPrivate.h
index 9c9194f93e..ae45e632b3 100644
--- a/Classes/BITCrashManagerPrivate.h
+++ b/Classes/BITCrashManagerPrivate.h
@@ -38,6 +38,21 @@
 @interface BITCrashManager () {
 }
 
+
+///-----------------------------------------------------------------------------
+/// @name Delegate
+///-----------------------------------------------------------------------------
+
+/**
+ Sets the optional `BITCrashManagerDelegate` delegate.
+ 
+ The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
+ should not need to set this delegate individually.
+ 
+ @see `[BITHockeyManager setDelegate:]`
+ */
+@property (nonatomic, weak) id delegate;
+
 /**
  * must be set
  */
diff --git a/Classes/BITFeedbackManager.h b/Classes/BITFeedbackManager.h
index e497f5d22d..c86bd46a22 100644
--- a/Classes/BITFeedbackManager.h
+++ b/Classes/BITFeedbackManager.h
@@ -136,23 +136,6 @@ typedef NS_ENUM(NSInteger, BITFeedbackObservationMode) {
 
 @interface BITFeedbackManager : BITHockeyBaseManager
 
-///-----------------------------------------------------------------------------
-/// @name Delegate
-///-----------------------------------------------------------------------------
-
-/**
- Sets the `BITFeedbackManagerDelegate` delegate.
-
- Can be set to be notified when new feedback is received from the server.
- 
- The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
- should not need to set this delegate individually.
- 
- @see `[BITHockeyManager setDelegate:]`
- */
-@property (nonatomic, weak) id<BITFeedbackManagerDelegate> delegate;
-
-
 ///-----------------------------------------------------------------------------
 /// @name General settings
 ///-----------------------------------------------------------------------------
diff --git a/Classes/BITFeedbackManagerPrivate.h b/Classes/BITFeedbackManagerPrivate.h
index c7ba433042..23ae1d988a 100644
--- a/Classes/BITFeedbackManagerPrivate.h
+++ b/Classes/BITFeedbackManagerPrivate.h
@@ -36,6 +36,23 @@
 }
 
 
+///-----------------------------------------------------------------------------
+/// @name Delegate
+///-----------------------------------------------------------------------------
+
+/**
+ Sets the `BITFeedbackManagerDelegate` delegate.
+ 
+ Can be set to be notified when new feedback is received from the server.
+ 
+ The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
+ should not need to set this delegate individually.
+ 
+ @see `[BITHockeyManager setDelegate:]`
+ */
+@property (nonatomic, weak) id<BITFeedbackManagerDelegate> delegate;
+
+
 @property (nonatomic, strong) NSMutableArray *feedbackList;
 @property (nonatomic, strong) NSString *token;
 
diff --git a/Classes/BITStoreUpdateManager.h b/Classes/BITStoreUpdateManager.h
index 4ba813315e..1b081b719f 100644
--- a/Classes/BITStoreUpdateManager.h
+++ b/Classes/BITStoreUpdateManager.h
@@ -75,16 +75,6 @@ typedef NS_ENUM(NSInteger, BITStoreUpdateSetting) {
 
 @interface BITStoreUpdateManager : BITHockeyBaseManager
 
-///-----------------------------------------------------------------------------
-/// @name Delegate
-///-----------------------------------------------------------------------------
-
-/**
- Sets the optional `BITStoreUpdateManagerDelegate` delegate.
- */
-@property (nonatomic, weak) id delegate;
-
-
 ///-----------------------------------------------------------------------------
 /// @name Update Checking
 ///-----------------------------------------------------------------------------
diff --git a/Classes/BITStoreUpdateManagerPrivate.h b/Classes/BITStoreUpdateManagerPrivate.h
index 26e354e7aa..c614f551ce 100644
--- a/Classes/BITStoreUpdateManagerPrivate.h
+++ b/Classes/BITStoreUpdateManagerPrivate.h
@@ -34,6 +34,16 @@
 @interface BITStoreUpdateManager () <UIAlertViewDelegate> {
 }
 
+///-----------------------------------------------------------------------------
+/// @name Delegate
+///-----------------------------------------------------------------------------
+
+/**
+ Sets the optional `BITStoreUpdateManagerDelegate` delegate.
+ */
+@property (nonatomic, weak) id delegate;
+
+
 // is an update available?
 @property (nonatomic, assign, getter=isUpdateAvailable) BOOL updateAvailable;
 
diff --git a/Classes/BITUpdateManager.h b/Classes/BITUpdateManager.h
index f10f8c30d3..dc5cfdbbb2 100644
--- a/Classes/BITUpdateManager.h
+++ b/Classes/BITUpdateManager.h
@@ -75,22 +75,6 @@ typedef NS_ENUM (NSUInteger, BITUpdateSetting) {
 
 @interface BITUpdateManager : BITHockeyBaseManager <UIAlertViewDelegate>
 
-
-///-----------------------------------------------------------------------------
-/// @name Delegate
-///-----------------------------------------------------------------------------
-
-/**
- Sets the `BITUpdateManagerDelegate` delegate. 
-
- The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
- should not need to set this delegate individually.
- 
- @see `[BITHockeyManager setDelegate:]`
- */
-@property (nonatomic, weak) id delegate;
-
-
 ///-----------------------------------------------------------------------------
 /// @name Update Checking
 ///-----------------------------------------------------------------------------
diff --git a/Classes/BITUpdateManagerPrivate.h b/Classes/BITUpdateManagerPrivate.h
index 7519185360..bbc35d0ad9 100644
--- a/Classes/BITUpdateManagerPrivate.h
+++ b/Classes/BITUpdateManagerPrivate.h
@@ -39,6 +39,21 @@
 @interface BITUpdateManager () {
 }
 
+///-----------------------------------------------------------------------------
+/// @name Delegate
+///-----------------------------------------------------------------------------
+
+/**
+ Sets the `BITUpdateManagerDelegate` delegate.
+ 
+ The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
+ should not need to set this delegate individually.
+ 
+ @see `[BITHockeyManager setDelegate:]`
+ */
+@property (nonatomic, weak) id delegate;
+
+
 // is an update available?
 @property (nonatomic, assign, getter=isUpdateAvailable) BOOL updateAvailable;