diff --git a/Classes/BITActivityIndicatorButton.m b/Classes/BITActivityIndicatorButton.m
index 00966186f6..340735fbfb 100644
--- a/Classes/BITActivityIndicatorButton.m
+++ b/Classes/BITActivityIndicatorButton.m
@@ -24,6 +24,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITActivityIndicatorButton.h"
 
 @interface BITActivityIndicatorButton()
@@ -74,3 +78,5 @@
 
 
 @end
+
+#endif
diff --git a/Classes/BITAppStoreHeader.m b/Classes/BITAppStoreHeader.m
index 87a967f4e3..5c1e1cc6ba 100644
--- a/Classes/BITAppStoreHeader.m
+++ b/Classes/BITAppStoreHeader.m
@@ -28,6 +28,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_UPDATES
 
 #import "BITAppStoreHeader.h"
 #import "BITHockeyHelper.h"
@@ -158,3 +161,5 @@
 }
 
 @end
+
+#endif
diff --git a/Classes/BITArrowImageAnnotation.m b/Classes/BITArrowImageAnnotation.m
index ec7ccd9a4a..d465d209e5 100644
--- a/Classes/BITArrowImageAnnotation.m
+++ b/Classes/BITArrowImageAnnotation.m
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITArrowImageAnnotation.h"
 
 #define kArrowPointCount 7
@@ -202,3 +206,5 @@
 }
 
 @end
+
+#endif
diff --git a/Classes/BITAttributedLabel.m b/Classes/BITAttributedLabel.m
index d2d5fb4413..510c83e015 100644
--- a/Classes/BITAttributedLabel.m
+++ b/Classes/BITAttributedLabel.m
@@ -20,6 +20,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITAttributedLabel.h"
 
 #define kBITLineBreakWordWrapTextWidthScalingFactor (M_PI / M_E)
@@ -1020,3 +1024,5 @@ static inline NSAttributedString * NSAttributedStringBySettingColorFromContext(N
 @end
 
 #pragma clang diagnostic pop
+
+#endif
diff --git a/Classes/BITAuthenticationViewController.m b/Classes/BITAuthenticationViewController.m
index 759aa7b250..b46df8a5c6 100644
--- a/Classes/BITAuthenticationViewController.m
+++ b/Classes/BITAuthenticationViewController.m
@@ -26,10 +26,13 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_AUTHENTICATOR
+
 #import "BITAuthenticationViewController.h"
 #import "BITAuthenticator_Private.h"
 #import "HockeySDKPrivate.h"
-#import "HockeySDK.h"
 #import "BITHockeyHelper.h"
 #import "BITHockeyAppClient.h"
 
@@ -330,3 +333,5 @@
 }
 
 @end
+
+#endif
diff --git a/Classes/BITBlurImageAnnotation.m b/Classes/BITBlurImageAnnotation.m
index 356b05b39b..d80c12fa87 100644
--- a/Classes/BITBlurImageAnnotation.m
+++ b/Classes/BITBlurImageAnnotation.m
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITBlurImageAnnotation.h"
 
 @interface BITBlurImageAnnotation()
@@ -99,3 +103,5 @@
 }
 
 @end
+
+#endif
diff --git a/Classes/BITCrashAttachment.m b/Classes/BITCrashAttachment.m
index 011c87a967..f4f408d25d 100644
--- a/Classes/BITCrashAttachment.m
+++ b/Classes/BITCrashAttachment.m
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_CRASH_REPORTER
+
 #import "BITCrashAttachment.h"
 
 @implementation BITCrashAttachment
@@ -40,3 +44,5 @@
 }
 
 @end
+
+#endif
diff --git a/Classes/BITCrashCXXExceptionHandler.mm b/Classes/BITCrashCXXExceptionHandler.mm
index 726029ecdd..b0991683f6 100644
--- a/Classes/BITCrashCXXExceptionHandler.mm
+++ b/Classes/BITCrashCXXExceptionHandler.mm
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_CRASH_REPORTER
+
 #import "BITCrashCXXExceptionHandler.h"
 #import <vector>
 #import <cxxabi.h>
@@ -231,3 +235,5 @@ static void BITCrashUncaughtCXXTerminateHandler(void)
 }
 
 @end
+
+#endif
diff --git a/Classes/BITCrashDetails.m b/Classes/BITCrashDetails.m
index ef74781ba9..6c7820f05d 100644
--- a/Classes/BITCrashDetails.m
+++ b/Classes/BITCrashDetails.m
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_CRASH_REPORTER
+
 #import "BITCrashDetails.h"
 #import "BITCrashDetailsPrivate.h"
 
@@ -73,3 +77,5 @@ NSString *const kBITCrashKillSignal = @"SIGKILL";
 }
 
 @end
+
+#endif
diff --git a/Classes/BITCrashMetaData.m b/Classes/BITCrashMetaData.m
index 824d149b93..2ec133dd65 100644
--- a/Classes/BITCrashMetaData.m
+++ b/Classes/BITCrashMetaData.m
@@ -26,9 +26,14 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#import "BITCrashMetaData.h"
+#import "HockeySDK.h"
 
+#if HOCKEYSDK_FEATURE_CRASH_REPORTER
+
+#import "BITCrashMetaData.h"
 
 @implementation BITCrashMetaData
 
 @end
+
+#endif
diff --git a/Classes/BITCrashReportTextFormatter.m b/Classes/BITCrashReportTextFormatter.m
index b6b089fc99..4e40b50da1 100644
--- a/Classes/BITCrashReportTextFormatter.m
+++ b/Classes/BITCrashReportTextFormatter.m
@@ -31,6 +31,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_CRASH_REPORTER
+
 #import <CrashReporter/CrashReporter.h>
 
 #import <mach-o/dyld.h>
@@ -877,3 +881,5 @@ static const char *findSEL (const char *imageName, NSString *imageUUID, uint64_t
 }
 
 @end
+
+#endif
diff --git a/Classes/BITHockeyAttachment.m b/Classes/BITHockeyAttachment.m
index 4dc6424acc..4da8595797 100644
--- a/Classes/BITHockeyAttachment.m
+++ b/Classes/BITHockeyAttachment.m
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_CRASH_REPORTER || HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITHockeyAttachment.h"
 
 @implementation BITHockeyAttachment
@@ -73,3 +77,5 @@
 }
 
 @end
+
+#endif
diff --git a/Classes/BITHockeyBaseViewController.m b/Classes/BITHockeyBaseViewController.m
index a7c6ddfd8b..96abc1213b 100644
--- a/Classes/BITHockeyBaseViewController.m
+++ b/Classes/BITHockeyBaseViewController.m
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_AUTHENTICATOR || HOCKEYSDK_FEATURE_UPDATES || HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITHockeyBaseViewController.h"
 #import "HockeySDKPrivate.h"
 
@@ -105,3 +109,5 @@
 
 
 @end
+
+#endif
diff --git a/Classes/BITHockeyHelper.m b/Classes/BITHockeyHelper.m
index 3e51ad8e0c..0bab77110e 100644
--- a/Classes/BITHockeyHelper.m
+++ b/Classes/BITHockeyHelper.m
@@ -39,8 +39,7 @@
 NSString *bit_URLEncodedString(NSString *inputString) {
   // Requires iOS 7
   if ([inputString respondsToSelector:@selector(stringByAddingPercentEncodingWithAllowedCharacters:)]) {
-    NSCharacterSet *allowedSet = [NSCharacterSet characterSetWithCharactersInString:@"!*'();:@&=+$,/?%#[]"];
-    return [inputString stringByAddingPercentEncodingWithAllowedCharacters:allowedSet];
+    return [inputString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLHostAllowedCharacterSet]];
   } else {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
diff --git a/Classes/BITImageAnnotation.m b/Classes/BITImageAnnotation.m
index 4870c8ecd6..f9f1bcee0a 100644
--- a/Classes/BITImageAnnotation.m
+++ b/Classes/BITImageAnnotation.m
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITImageAnnotation.h"
 
 @implementation BITImageAnnotation
@@ -43,3 +47,5 @@
 }
 
 @end
+
+#endif
diff --git a/Classes/BITImageAnnotationViewController.m b/Classes/BITImageAnnotationViewController.m
index 7e17650802..81ce400231 100644
--- a/Classes/BITImageAnnotationViewController.m
+++ b/Classes/BITImageAnnotationViewController.m
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITImageAnnotationViewController.h"
 #import "BITImageAnnotation.h"
 #import "BITRectangleImageAnnotation.h"
@@ -414,3 +418,5 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
   return [self.editingControls selectedSegmentIndex] != UISegmentedControlNoSegment;
 }
 @end
+
+#endif
diff --git a/Classes/BITRectangleImageAnnotation.m b/Classes/BITRectangleImageAnnotation.m
index 60e123095b..f6b03fea73 100644
--- a/Classes/BITRectangleImageAnnotation.m
+++ b/Classes/BITRectangleImageAnnotation.m
@@ -26,6 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_FEEDBACK
+
 #import "BITRectangleImageAnnotation.h"
 
 @interface BITRectangleImageAnnotation()
@@ -84,3 +88,5 @@
 
 
 @end
+
+#endif
diff --git a/Classes/BITStoreButton.m b/Classes/BITStoreButton.m
index b5373b98b9..fb5f1ba133 100644
--- a/Classes/BITStoreButton.m
+++ b/Classes/BITStoreButton.m
@@ -28,6 +28,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import "HockeySDK.h"
+
+#if HOCKEYSDK_FEATURE_UPDATES
 
 #import "BITStoreButton.h"
 #import "HockeySDKPrivate.h"
@@ -272,3 +275,5 @@
 }
 
 @end
+
+#endif
diff --git a/Classes/BITWebTableViewCell.m b/Classes/BITWebTableViewCell.m
index 42b605af48..7948cf631e 100644
--- a/Classes/BITWebTableViewCell.m
+++ b/Classes/BITWebTableViewCell.m
@@ -28,8 +28,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#import "BITWebTableViewCell.h"
+#import "HockeySDK.h"
 
+#if HOCKEYSDK_FEATURE_UPDATES
+
+#import "BITWebTableViewCell.h"
 
 @implementation BITWebTableViewCell
 
@@ -179,3 +182,5 @@ body { font: 13px 'Helvetica Neue', Helvetica; color:#626262; word-wrap:break-wo
 }
 
 @end
+
+#endif
diff --git a/Classes/HockeySDK.h b/Classes/HockeySDK.h
index 0a2b153832..c6836ba597 100644
--- a/Classes/HockeySDK.h
+++ b/Classes/HockeySDK.h
@@ -27,11 +27,14 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import <Foundation/Foundation.h>
 
-#ifndef TARGET_OS_IOS // Defined starting in iOS 9
+
+#if !defined (TARGET_OS_IOS) // Defined starting in iOS 9
 #define TARGET_OS_IOS 1
 #endif
 
+
 #import "HockeySDKFeatureConfig.h"
 
 #import "BITHockeyManager.h"