diff --git a/Classes/BITActivityIndicatorButton.m b/Classes/BITActivityIndicatorButton.m
index 340735fbfb..6a731bb434 100644
--- a/Classes/BITActivityIndicatorButton.m
+++ b/Classes/BITActivityIndicatorButton.m
@@ -79,4 +79,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITAppStoreHeader.m b/Classes/BITAppStoreHeader.m
index 5c1e1cc6ba..f9a487e092 100644
--- a/Classes/BITAppStoreHeader.m
+++ b/Classes/BITAppStoreHeader.m
@@ -162,4 +162,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/Classes/BITArrowImageAnnotation.m b/Classes/BITArrowImageAnnotation.m
index d465d209e5..3f34459980 100644
--- a/Classes/BITArrowImageAnnotation.m
+++ b/Classes/BITArrowImageAnnotation.m
@@ -207,4 +207,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITAuthenticationViewController.m b/Classes/BITAuthenticationViewController.m
index b46df8a5c6..f9a495a4fd 100644
--- a/Classes/BITAuthenticationViewController.m
+++ b/Classes/BITAuthenticationViewController.m
@@ -334,4 +334,4 @@
 
 @end
 
-#endif
+#endif  /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
diff --git a/Classes/BITAuthenticator.m b/Classes/BITAuthenticator.m
index 9cd9d00d7b..7e7bb61194 100644
--- a/Classes/BITAuthenticator.m
+++ b/Classes/BITAuthenticator.m
@@ -996,4 +996,4 @@ static unsigned char kBITPNGEndChunk[4] = {0x49, 0x45, 0x4e, 0x44};
 
 @end
 
-#endif
+#endif  /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
diff --git a/Classes/BITAuthenticator_Private.h b/Classes/BITAuthenticator_Private.h
index 852e9d11c2..6754a4ea0a 100644
--- a/Classes/BITAuthenticator_Private.h
+++ b/Classes/BITAuthenticator_Private.h
@@ -103,4 +103,4 @@
 - (void) authenticate;
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
diff --git a/Classes/BITBlurImageAnnotation.m b/Classes/BITBlurImageAnnotation.m
index d80c12fa87..62ba7517c5 100644
--- a/Classes/BITBlurImageAnnotation.m
+++ b/Classes/BITBlurImageAnnotation.m
@@ -104,4 +104,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITCrashCXXExceptionHandler.mm b/Classes/BITCrashCXXExceptionHandler.mm
index b0991683f6..d4e8ab0393 100644
--- a/Classes/BITCrashCXXExceptionHandler.mm
+++ b/Classes/BITCrashCXXExceptionHandler.mm
@@ -236,4 +236,4 @@ static void BITCrashUncaughtCXXTerminateHandler(void)
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
diff --git a/Classes/BITCrashDetails.m b/Classes/BITCrashDetails.m
index 6c7820f05d..d5d5c9c69f 100644
--- a/Classes/BITCrashDetails.m
+++ b/Classes/BITCrashDetails.m
@@ -78,4 +78,4 @@ NSString *const kBITCrashKillSignal = @"SIGKILL";
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
diff --git a/Classes/BITCrashManager.m b/Classes/BITCrashManager.m
index d27fecb407..2d446a5373 100644
--- a/Classes/BITCrashManager.m
+++ b/Classes/BITCrashManager.m
@@ -1106,7 +1106,7 @@ static void uncaught_cxx_exception_handler(const BITCrashUncaughtCXXExceptionInf
 #pragma clang diagnostic pop
         }
       }
-#endif
+#endif /* !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions) */
       
     } else {
       [self approveLatestCrashReport];
@@ -1524,7 +1524,7 @@ static void uncaught_cxx_exception_handler(const BITCrashUncaughtCXXExceptionInf
 }
 #pragma clang diagnostic pop
 
-#endif 
+#endif /* !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions) */
 
 
 #pragma mark - Networking
diff --git a/Classes/BITCrashReportTextFormatter.m b/Classes/BITCrashReportTextFormatter.m
index aca1c8d6b4..1dd7cab44a 100644
--- a/Classes/BITCrashReportTextFormatter.m
+++ b/Classes/BITCrashReportTextFormatter.m
@@ -876,4 +876,4 @@ static const char *findSEL (const char *imageName, NSString *imageUUID, uint64_t
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
diff --git a/Classes/BITFeedbackListViewCell.m b/Classes/BITFeedbackListViewCell.m
index 5e6867a373..91dc8826bd 100644
--- a/Classes/BITFeedbackListViewCell.m
+++ b/Classes/BITFeedbackListViewCell.m
@@ -370,4 +370,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITFeedbackMessage.m b/Classes/BITFeedbackMessage.m
index 2e97766c53..e0c05c4055 100644
--- a/Classes/BITFeedbackMessage.m
+++ b/Classes/BITFeedbackMessage.m
@@ -117,4 +117,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITFeedbackMessageAttachment.m b/Classes/BITFeedbackMessageAttachment.m
index bc5f7f2e27..ab1e110b31 100644
--- a/Classes/BITFeedbackMessageAttachment.m
+++ b/Classes/BITFeedbackMessageAttachment.m
@@ -261,4 +261,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITHockeyAttachment.m b/Classes/BITHockeyAttachment.m
index 4da8595797..d302609bfa 100644
--- a/Classes/BITHockeyAttachment.m
+++ b/Classes/BITHockeyAttachment.m
@@ -78,4 +78,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER || HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITHockeyBaseManager.m b/Classes/BITHockeyBaseManager.m
index ecac046109..25410d14a8 100644
--- a/Classes/BITHockeyBaseManager.m
+++ b/Classes/BITHockeyBaseManager.m
@@ -293,7 +293,7 @@
       [(BITHockeyBaseViewController *)viewController setModalAnimated:NO];
     [visibleWindow addSubview:_navController.view];
   }
-#endif
+#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR || HOCKEYSDK_FEATURE_UPDATES || HOCKEYSDK_FEATURE_FEEDBACK */
 }
 #endif // HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions && HOCKEYSDK_CONFIGURATION_RelaseCrashOnlyWatchOS
 
diff --git a/Classes/BITHockeyBaseViewController.m b/Classes/BITHockeyBaseViewController.m
index 96abc1213b..9c00c746b4 100644
--- a/Classes/BITHockeyBaseViewController.m
+++ b/Classes/BITHockeyBaseViewController.m
@@ -110,4 +110,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR || HOCKEYSDK_FEATURE_UPDATES || HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITImageAnnotationViewController.m b/Classes/BITImageAnnotationViewController.m
index 81ce400231..347ea21273 100644
--- a/Classes/BITImageAnnotationViewController.m
+++ b/Classes/BITImageAnnotationViewController.m
@@ -419,4 +419,4 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
 }
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITRectangleImageAnnotation.m b/Classes/BITRectangleImageAnnotation.m
index f6b03fea73..4f21f6a904 100644
--- a/Classes/BITRectangleImageAnnotation.m
+++ b/Classes/BITRectangleImageAnnotation.m
@@ -89,4 +89,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITStoreButton.m b/Classes/BITStoreButton.m
index fb5f1ba133..40f3484aeb 100644
--- a/Classes/BITStoreButton.m
+++ b/Classes/BITStoreButton.m
@@ -276,4 +276,4 @@
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/Classes/BITUpdateManager.m b/Classes/BITUpdateManager.m
index 0f52f73b2a..e6784aed30 100644
--- a/Classes/BITUpdateManager.m
+++ b/Classes/BITUpdateManager.m
@@ -970,7 +970,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
   
   return success;
 
-#endif
+#endif /* TARGET_IPHONE_SIMULATOR */
 }
 
 
diff --git a/Classes/BITWebTableViewCell.m b/Classes/BITWebTableViewCell.m
index 7948cf631e..584d6b03d6 100644
--- a/Classes/BITWebTableViewCell.m
+++ b/Classes/BITWebTableViewCell.m
@@ -183,4 +183,4 @@ body { font: 13px 'Helvetica Neue', Helvetica; color:#626262; word-wrap:break-wo
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/Classes/HockeySDKNullability.h b/Classes/HockeySDKNullability.h
index 5a2be266d0..8fdddd4b21 100644
--- a/Classes/HockeySDKNullability.h
+++ b/Classes/HockeySDKNullability.h
@@ -30,4 +30,4 @@
 #define NS_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")
 #endif
 
-#endif
+#endif /* HockeySDK_HockeyNullability_h */
diff --git a/Classes/HockeySDKPrivate.h b/Classes/HockeySDKPrivate.h
index b10068f17c..b4f57e5044 100644
--- a/Classes/HockeySDKPrivate.h
+++ b/Classes/HockeySDKPrivate.h
@@ -90,4 +90,4 @@ NSString *BITHockeyMD5(NSString *str);
 
 #endif
 
-#endif //HockeySDK_HockeySDKPrivate_h
+#endif /* HockeySDK_HockeySDKPrivate_h */