diff --git a/macosx/Controller.h b/macosx/Controller.h
index efdd92092..490aaf8bd 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -24,18 +24,18 @@
 
 #import <Cocoa/Cocoa.h>
 #import <transmission.h>
-#import "PrefsController.h"
-#import "InfoWindowController.h"
-#import "MessageWindowController.h"
-#import "AddWindowController.h"
-#import "DragOverlayWindow.h"
-#import "Badger.h"
-
 #import <Growl/Growl.h>
 
-@class TorrentTableView;
-@class StatusBarView;
+@class AddWindowController;
+@class Badger;
+@class DragOverlayWindow;
 @class FilterButton;
+@class InfoWindowController;
+@class MessageWindowController;
+@class PrefsController;
+@class StatusBarView;
+@class Torrent;
+@class TorrentTableView;
 
 typedef enum
 {
@@ -48,7 +48,7 @@ typedef enum
 
 @interface Controller : NSObject <GrowlApplicationBridgeDelegate>
 {
-    tr_session                       * fLib;
+    tr_session                      * fLib;
     
     NSMutableArray                  * fTorrents, * fDisplayedTorrents;
     
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 5fb97f28a..acd62c854 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -32,8 +32,12 @@
 #import "TorrentTableView.h"
 #import "CreatorWindowController.h"
 #import "StatsWindowController.h"
+#import "InfoWindowController.h"
+#import "PrefsController.h"
 #import "GroupsController.h"
 #import "AboutWindowController.h"
+#import "AddWindowController.h"
+#import "MessageWindowController.h"
 #import "ButtonToolbarItem.h"
 #import "GroupToolbarItem.h"
 #import "ToolbarSegmentedCell.h"
@@ -41,6 +45,8 @@
 #import "StatusBarView.h"
 #import "FilterButton.h"
 #import "BonjourController.h"
+#import "Badger.h"
+#import "DragOverlayWindow.h"
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #import "ExpandedPathToPathTransformer.h"
diff --git a/macosx/TorrentTableView.h b/macosx/TorrentTableView.h
index 4678b53d0..f306c9ef8 100644
--- a/macosx/TorrentTableView.h
+++ b/macosx/TorrentTableView.h
@@ -24,9 +24,10 @@
 
 #import <Cocoa/Cocoa.h>
 #import <transmission.h>
-#import "Controller.h"
 #import <Quartz/Quartz.h>
 
+@class Controller;
+@class Torrent;
 @class TorrentCell;
 
 #define GROUP_SEPARATOR_HEIGHT 18.0
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index 25d5a4774..d03b1ed4e 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -23,11 +23,12 @@
  *****************************************************************************/
 
 #import "TorrentTableView.h"
-#import "TorrentCell.h"
-#import "Torrent.h"
-#import "TorrentGroup.h"
+#import "Controller.h"
 #import "FileListNode.h"
 #import "NSApplicationAdditions.h"
+#import "Torrent.h"
+#import "TorrentCell.h"
+#import "TorrentGroup.h"
 
 #define MAX_GROUP 999999