diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index 35abe99..a61779e 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -4,7 +4,7 @@ PODS:
     - MagicalRecord/Core (= 2.2)
   - MagicalRecord/Core (2.2)
   - OCMock (3.1.2)
-  - SSDataSources (0.8.3)
+  - SSDataSources (0.8.4)
 
 DEPENDENCIES:
   - Expecta
@@ -20,6 +20,6 @@ SPEC CHECKSUMS:
   Expecta: 8c507baf13211207b1e9d0a741480600e6b4ed15
   MagicalRecord: f8a56bb87ab6552f20c4bb8681a1958a197ea3cd
   OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
-  SSDataSources: ae1b68dc96afbe8035c7075d68a8bde4e3ab9668
+  SSDataSources: b93d3818dd029bbaf59356e25348acb776356e38
 
 COCOAPODS: 0.36.3
diff --git a/SSDataSources.podspec b/SSDataSources.podspec
index 0085185..2aa4f21 100644
--- a/SSDataSources.podspec
+++ b/SSDataSources.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SSDataSources"
-  s.version      = "0.8.3"
+  s.version      = "0.8.4"
   s.summary      = "Flexible data sources for your UITableView and UICollectionView."
   s.homepage     = "https://github.com/splinesoft/SSDataSources"
   s.license      = { :type => 'MIT', :file => 'LICENSE'  }
diff --git a/SSDataSources/SSArrayDataSource.h b/SSDataSources/SSArrayDataSource.h
index 453c507..61140cc 100644
--- a/SSDataSources/SSArrayDataSource.h
+++ b/SSDataSources/SSArrayDataSource.h
@@ -7,7 +7,7 @@
 //
 
 #import "SSBaseDataSource.h"
-@import CoreData;
+#import <CoreData/CoreData.h>
 
 /**
  * Data source for single-sectioned table and collection views.
diff --git a/SSDataSources/SSBaseCollectionCell.h b/SSDataSources/SSBaseCollectionCell.h
index b90f122..eb55843 100644
--- a/SSDataSources/SSBaseCollectionCell.h
+++ b/SSDataSources/SSBaseCollectionCell.h
@@ -12,7 +12,7 @@
  * You probably don't need to override `identifier`.
  */
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 
 @interface SSBaseCollectionCell : UICollectionViewCell
 
diff --git a/SSDataSources/SSBaseCollectionReusableView.h b/SSDataSources/SSBaseCollectionReusableView.h
index b0c4b87..78b1818 100644
--- a/SSDataSources/SSBaseCollectionReusableView.h
+++ b/SSDataSources/SSBaseCollectionReusableView.h
@@ -10,7 +10,7 @@
  * A simple base collection reusable view. Subclass me if necessary.
  */
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 
 @interface SSBaseCollectionReusableView : UICollectionReusableView
 
diff --git a/SSDataSources/SSBaseDataSource.h b/SSDataSources/SSBaseDataSource.h
index 402ee6a..68472d6 100644
--- a/SSDataSources/SSBaseDataSource.h
+++ b/SSDataSources/SSBaseDataSource.h
@@ -13,8 +13,7 @@
  * SSArrayDataSource, SSSectionedDataSource, SSCoreDataSource, and SSExpandingDataSource.
  */
 
-@import Foundation;
-@import UIKit;
+#import <UIKit/UIKit.h>
 
 @interface SSBaseDataSource : NSObject <UITableViewDataSource, UICollectionViewDataSource>
 
diff --git a/SSDataSources/SSBaseHeaderFooterView.h b/SSDataSources/SSBaseHeaderFooterView.h
index 840f3c1..f0f0a17 100644
--- a/SSDataSources/SSBaseHeaderFooterView.h
+++ b/SSDataSources/SSBaseHeaderFooterView.h
@@ -11,7 +11,7 @@
  * Subclass me if necessary.
  */
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 
 @interface SSBaseHeaderFooterView : UITableViewHeaderFooterView
 
diff --git a/SSDataSources/SSBaseTableCell.h b/SSDataSources/SSBaseTableCell.h
index 331fe8f..63eae4e 100644
--- a/SSDataSources/SSBaseTableCell.h
+++ b/SSDataSources/SSBaseTableCell.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 Jonathan Hersh. All rights reserved.
 //
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 
 /**
  * A simple base table cell. Subclass me and override configureCell
diff --git a/SSDataSources/SSCoreDataSource.h b/SSDataSources/SSCoreDataSource.h
index 9767782..a47f3fa 100644
--- a/SSDataSources/SSCoreDataSource.h
+++ b/SSDataSources/SSCoreDataSource.h
@@ -7,7 +7,7 @@
 //
 
 #import "SSBaseDataSource.h"
-@import CoreData;
+#import <CoreData/CoreData.h>
 
 /**
  * Generic table/collectionview data source, useful when your data comes from an NSFetchedResultsController.
diff --git a/SSDataSources/SSSection.h b/SSDataSources/SSSection.h
index 9e2eb3d..f0aad3c 100644
--- a/SSDataSources/SSSection.h
+++ b/SSDataSources/SSSection.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 Splinesoft. All rights reserved.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 /**
  * SSSection models a single section in a multi-sectioned table or collection view