10 files changed, 11 insertions, 17 deletions
diff --git a/Juick/APIClient.h b/Juick/APIClient.h
index dd7d13b..5cf6437 100644
--- a/Juick/APIClient.h
+++ b/Juick/APIClient.h
@@ -7,7 +7,6 @@
 //
 #import <Foundation/Foundation.h>
 #import "Message.h"
-@import AFNetworking;
 
 @interface APIClient : NSObject
 
diff --git a/Juick/Model/User.h b/Juick/Model/User.h
index 1d4897e..2710e4a 100644
--- a/Juick/Model/User.h
+++ b/Juick/Model/User.h
@@ -7,7 +7,6 @@
 //
 
 @import Foundation;
-@import YYModel;
 
 @interface User : NSObject
 @property (nonatomic, strong) NSString *uname;
diff --git a/Juick/Model/User.m b/Juick/Model/User.m
index 8c20aa3..1576a91 100644
--- a/Juick/Model/User.m
+++ b/Juick/Model/User.m
@@ -7,8 +7,6 @@
 //
 
 #import "User.h"
-
-@import PDKeychainBindingsController;
 #import "APIClient.h"
 
 @implementation User
diff --git a/Juick/Supporting Files/Juick-Prefix.pch b/Juick/Supporting Files/Juick-Prefix.pch
index 1af6911..0f3a8e7 100644
--- a/Juick/Supporting Files/Juick-Prefix.pch
+++ b/Juick/Supporting Files/Juick-Prefix.pch
@@ -16,4 +16,15 @@
     #import <SystemConfiguration/SystemConfiguration.h>
     #import <MobileCoreServices/MobileCoreServices.h>
     #import <UserNotifications/UserNotifications.h>
+
+    #import <PDKeychainBindingsController/PDKeychainBindingsController.h>
+    #import <NSString+HTML.h>
+    #import "UIImage+Utils.h"
+    #import <TTTAttributedLabel/TTTAttributedLabel.h>
+    #import <AFNetworking/AFNetworking.h>
+    #import <AFNetworking/UIImageView+AFNetworking.h>
+    #import <YYModel/YYModel.h>
+    #import <DateTools/DateTools.h>
+    #import <TagListView-ObjC/TagListView.h>
+    #import <PHFComposeBarView/PHFComposeBarView.h>
 #endif
diff --git a/Juick/ViewControllers/ChatViewController.h b/Juick/ViewControllers/ChatViewController.h
index 3479942..a5c5d5a 100644
--- a/Juick/ViewControllers/ChatViewController.h
+++ b/Juick/ViewControllers/ChatViewController.h
@@ -9,8 +9,6 @@
 #import <UIKit/UIKit.h>
 #import "User.h"
 
-@import PHFComposeBarView;
-
 @interface ChatViewController : UITableViewController<PHFComposeBarViewDelegate>
 @property(nonatomic, strong) NSMutableArray *messages;
 @property(nonatomic, strong) NSString *uname;
diff --git a/Juick/Views/BubbleMessageCell.h b/Juick/Views/BubbleMessageCell.h
index 1f5d2e9..875efd3 100644
--- a/Juick/Views/BubbleMessageCell.h
+++ b/Juick/Views/BubbleMessageCell.h
@@ -10,8 +10,6 @@
 #import "Message.h"
 #import "FixedLabel.h"
 
-@import TTTAttributedLabel;
-
 @interface BubbleMessageCell : UITableViewCell<TTTAttributedLabelDelegate>
 @property (strong, nonatomic) IBOutlet UIImageView *avatarView;
 @property (strong, nonatomic) IBOutlet UILabel *unreadMarker;
diff --git a/Juick/Views/BubbleMessageCell.m b/Juick/Views/BubbleMessageCell.m
index 33a4206..51fbaa2 100644
--- a/Juick/Views/BubbleMessageCell.m
+++ b/Juick/Views/BubbleMessageCell.m
@@ -8,7 +8,6 @@
 
 #import "BubbleMessageCell.h"
 #import "ColorScheme.h"
-@import AFNetworking;
 
 @implementation BubbleMessageCell
 
diff --git a/Juick/Views/ConversationCell.m b/Juick/Views/ConversationCell.m
index 780e74a..873f21e 100644
--- a/Juick/Views/ConversationCell.m
+++ b/Juick/Views/ConversationCell.m
@@ -7,7 +7,6 @@
 //
 
 #import "ConversationCell.h"
-@import AFNetworking;
 
 @implementation ConversationCell
 
diff --git a/Juick/Views/MessageCell.h b/Juick/Views/MessageCell.h
index 475eea3..d9a5533 100644
--- a/Juick/Views/MessageCell.h
+++ b/Juick/Views/MessageCell.h
@@ -7,8 +7,6 @@
 //
 
 #import <UIKit/UIKit.h>
-@import TTTAttributedLabel;
-@import TagListView_ObjC;
 #import "Message.h"
 
 @protocol MessageCellDelegate
diff --git a/Juick/Views/MessageCell.m b/Juick/Views/MessageCell.m
index 4b08190..efdfbc6 100644
--- a/Juick/Views/MessageCell.m
+++ b/Juick/Views/MessageCell.m
@@ -8,13 +8,8 @@
 
 #import "MessageCell.h"
 #import "ColorScheme.h"
-#import "UIImage+Utils.h"
 #import "APIClient.h"
 
-@import DateTools;
-@import MWFeedParser;
-@import AFNetworking;
-
 @implementation MessageCell
 
 - (void)awakeFromNib {