@import

baRSS/Preferences/About Tab/SettingsAbout.h

@@ -20,7 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface SettingsAbout : NSViewController
 @end

baRSS/Preferences/About Tab/SettingsAboutView.h

@@ -20,7 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface SettingsAboutView : NSView
 @end

baRSS/Preferences/Appearance Tab/SettingsAppearance.h

@@ -20,7 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface SettingsAppearance : NSViewController
 - (void)didSelectCheckbox:(NSButton*)sender;

baRSS/Preferences/Appearance Tab/SettingsAppearance.m

@@ -25,7 +25,6 @@
 #import "AppHook.h"
 #import "BarStatusItem.h"
 
-
 @implementation SettingsAppearance
 
 - (void)loadView {

baRSS/Preferences/Appearance Tab/SettingsAppearanceView.h

@@ -20,8 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class SettingsAppearance;
 
 @interface SettingsAppearanceView : NSView

baRSS/Preferences/Feeds Tab/ModalFeedEdit.h

@@ -20,10 +20,9 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 #import "ModalSheet.h"
-
-@class FeedGroup;
+@class FeedGroup, ModalSheet;
 
 @interface ModalEditDialog : NSViewController
 + (instancetype)modalWith:(FeedGroup*)group;

baRSS/Preferences/Feeds Tab/ModalFeedEditView.h

@@ -20,8 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class ModalFeedEdit;
 
 @interface ModalFeedEditView : NSView

baRSS/Preferences/Feeds Tab/RefreshStatisticsView.h

@@ -20,7 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @protocol RefreshIntervalButtonDelegate <NSObject>
 @required

baRSS/Preferences/Feeds Tab/SettingsFeeds.h

@@ -20,7 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 /** Manages the NSOutlineView and Feed creation and editing */
 @interface SettingsFeeds : NSViewController <NSOutlineViewDelegate>

baRSS/Preferences/Feeds Tab/SettingsFeedsView.h

@@ -20,8 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class SettingsFeeds;
 
 @interface SettingsFeedsView : NSView

baRSS/Preferences/Feeds Tab/SettingsFeedsView.m

@@ -29,7 +29,6 @@
 #import "NSDate+Ext.h"
 #import "NSView+Ext.h"
 
-
 @interface SettingsFeedsView()
 @property (weak) SettingsFeeds *controller;
 @end

baRSS/Preferences/General Tab/SettingsGeneral.h

@@ -20,7 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface SettingsGeneral : NSViewController
 - (void)fixCache:(NSButton *)sender;

baRSS/Preferences/General Tab/SettingsGeneralView.h

@@ -20,8 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class SettingsGeneral;
 
 @interface SettingsGeneralView : NSView

baRSS/Preferences/Helper/ModalSheet.h

@@ -20,7 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface ModalSheet : NSPanel
 @property (readonly) BOOL didCloseAndCancel;

baRSS/Preferences/Helper/UserPrefs.h

@@ -20,7 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Foundation/Foundation.h>
+@import Cocoa;
 
 @interface UserPrefs : NSObject
 // User Preferences Plist

baRSS/Preferences/Helper/UserPrefs.m

@@ -23,8 +23,6 @@
 #import "UserPrefs.h"
 #import "StoreCoordinator.h"
 
-#import <Cocoa/Cocoa.h>
-
 @implementation UserPrefs
 
 #pragma mark - User Preferences Plist

baRSS/Preferences/Preferences.h

@@ -20,8 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#import <Cocoa/Cocoa.h>
-
+@import Cocoa;
 @class SettingsFeeds;
 
 @interface Preferences : NSWindow <NSWindowDelegate>