diff --git a/cocoa/BrowserView.h b/cocoa/BrowserView.h
index aa62e7ada..604027569 100644
--- a/cocoa/BrowserView.h
+++ b/cocoa/BrowserView.h
@@ -18,7 +18,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "ScrollableView.h"
+#import "cocoa/ScrollableView.h"
 @class HistoryView;
 
 @interface BrowserView : ScrollableView {
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m
index 28f7bc862..2951364ea 100644
--- a/cocoa/BrowserView.m
+++ b/cocoa/BrowserView.m
@@ -16,8 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "BrowserView.h"
-#import "HistoryView.h"
+#import "cocoa/BrowserView.h"
+#import "cocoa/HistoryView.h"
+#import "cocoa/font.h"
+#import "cocoa/plotter.h"
 
 #import "desktop/browser.h"
 #import "desktop/history_core.h"
@@ -26,9 +28,6 @@
 #import "desktop/options.h"
 #import "desktop/selection.h"
 
-#import "cocoa/font.h"
-#import "cocoa/plotter.h"
-
 @interface BrowserView ()
 
 - (void) scrollHorizontal: (CGFloat) amount;
diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m
index 99c06be84..5f59f780c 100644
--- a/cocoa/BrowserViewController.m
+++ b/cocoa/BrowserViewController.m
@@ -17,9 +17,9 @@
  */
 
 
-#import "BrowserViewController.h"
-#import "BrowserView.h"
-#import "BrowserWindowController.h"
+#import "cocoa/BrowserViewController.h"
+#import "cocoa/BrowserView.h"
+#import "cocoa/BrowserWindowController.h"
 
 #import "desktop/browser.h"
 #import "desktop/history_core.h"
diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m
index bb91a67d0..5e80db2fb 100644
--- a/cocoa/BrowserWindowController.m
+++ b/cocoa/BrowserWindowController.m
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "BrowserWindowController.h"
+#import "cocoa/BrowserWindowController.h"
 
-#import "BrowserViewController.h"
-#import "PSMTabBarControl.h"
-#import "PSMRolloverButton.h"
-#import "URLFieldCell.h"
+#import "cocoa/BrowserViewController.h"
+#import "cocoa/PSMTabBarControl/PSMTabBarControl.h"
+#import "cocoa/PSMTabBarControl/PSMRolloverButton.h"
+#import "cocoa/URLFieldCell.h"
 #import "cocoa/gui.h"
 #import "cocoa/NetsurfApp.h"
 
diff --git a/cocoa/DownloadWindowController.m b/cocoa/DownloadWindowController.m
index adce55f5d..1c525b58c 100644
--- a/cocoa/DownloadWindowController.m
+++ b/cocoa/DownloadWindowController.m
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "DownloadWindowController.h"
+#import "cocoa/DownloadWindowController.h"
+#import "cocoa/gui.h"
 
 #import "desktop/download.h"
 #import "desktop/gui.h"
-#import "cocoa/gui.h"
 
 @interface DownloadWindowController ()
 
diff --git a/cocoa/FormSelectMenu.m b/cocoa/FormSelectMenu.m
index 822655839..cfa4939d2 100644
--- a/cocoa/FormSelectMenu.m
+++ b/cocoa/FormSelectMenu.m
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "FormSelectMenu.h"
+#import "cocoa/FormSelectMenu.h"
+#import "cocoa/coordinates.h"
 
 #import "render/form.h"
-#import "cocoa/coordinates.h"
 
 @interface FormSelectMenu ()
 
diff --git a/cocoa/HistoryView.m b/cocoa/HistoryView.m
index 9dc8da71c..3315d252d 100644
--- a/cocoa/HistoryView.m
+++ b/cocoa/HistoryView.m
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "HistoryView.h"
+#import "cocoa/HistoryView.h"
+#import "cocoa/font.h"
+#import "cocoa/coordinates.h"
+#import "cocoa/plotter.h"
 
 #import "desktop/browser.h"
 #import "desktop/history_core.h"
 #import "desktop/plotters.h"
-#import "cocoa/font.h"
-#import "cocoa/coordinates.h"
-#import "cocoa/plotter.h"
 
 static NSRect cocoa_history_rect( struct browser_window *bw )
 {
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index 336524254..b6a3d2511 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -29,7 +29,6 @@
 
   CFLAGS += -I/usr/X11/include
   CFLAGS += -I/usr/include/libxml2
-  CFLAGS += -Icocoa/PSMTabBarControl
   CFLAGS += -include cocoa/Prefix.pch
 
 ifneq ($(wildcard /opt/local*),)
diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m
index 551800de8..b37ff9a9b 100644
--- a/cocoa/NetSurfAppDelegate.m
+++ b/cocoa/NetSurfAppDelegate.m
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "NetSurfAppDelegate.h"
+#import "cocoa/NetSurfAppDelegate.h"
 #import "cocoa/SearchWindowController.h"
 #import "cocoa/PreferencesWindowController.h"
 
diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m
index 609e6beed..0644c420f 100644
--- a/cocoa/NetsurfApp.m
+++ b/cocoa/NetsurfApp.m
@@ -16,29 +16,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "NetsurfApp.h"
-
+#import "cocoa/NetsurfApp.h"
 #import "cocoa/gui.h"
 #import "cocoa/plotter.h"
 
 #import "desktop/gui.h"
-#include "content/urldb.h"
-#include "content/fetch.h"
-#include "css/utils.h"
-#include "desktop/gui.h"
-#include "desktop/history_core.h"
-#include "desktop/mouse.h"
-#include "desktop/netsurf.h"
-#include "desktop/options.h"
-#include "desktop/plotters.h"
-#include "desktop/save_complete.h"
-#include "desktop/selection.h"
-#include "desktop/textinput.h"
-#include "render/html.h"
-#include "utils/url.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
+#import "content/urldb.h"
+#import "content/fetch.h"
+#import "css/utils.h"
+#import "desktop/gui.h"
+#import "desktop/history_core.h"
+#import "desktop/mouse.h"
+#import "desktop/netsurf.h"
+#import "desktop/options.h"
+#import "desktop/plotters.h"
+#import "desktop/save_complete.h"
+#import "desktop/selection.h"
+#import "desktop/textinput.h"
+#import "render/html.h"
+#import "utils/url.h"
+#import "utils/log.h"
+#import "utils/messages.h"
+#import "utils/utils.h"
 #import "css/utils.h"
 
 #ifndef NETSURF_HOMEPAGE
diff --git a/cocoa/ScrollableView.m b/cocoa/ScrollableView.m
index 2c58bcdd0..63a675323 100644
--- a/cocoa/ScrollableView.m
+++ b/cocoa/ScrollableView.m
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "ScrollableView.h"
+#import "cocoa/ScrollableView.h"
 
 @interface ScrollableView ()
 
diff --git a/cocoa/TreeView.h b/cocoa/TreeView.h
index aee45bb3d..3e6f18496 100644
--- a/cocoa/TreeView.h
+++ b/cocoa/TreeView.h
@@ -18,7 +18,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "ScrollableView.h"
+#import "cocoa/ScrollableView.h"
 
 @interface TreeView : ScrollableView {
 	struct tree *treeHandle;
diff --git a/cocoa/TreeView.m b/cocoa/TreeView.m
index 4f5f9b7be..633ef649e 100644
--- a/cocoa/TreeView.m
+++ b/cocoa/TreeView.m
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "TreeView.h"
+#import "cocoa/TreeView.h"
+#import "cocoa/coordinates.h"
 
 #import "desktop/tree.h"
 #import "desktop/plotters.h"
 #import "desktop/history_global_core.h"
-#import "cocoa/coordinates.h"
 
 @implementation TreeView
 
diff --git a/cocoa/URLFieldCell.m b/cocoa/URLFieldCell.m
index 5e5dfdb6b..ceba83cb3 100644
--- a/cocoa/URLFieldCell.m
+++ b/cocoa/URLFieldCell.m
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "URLFieldCell.h"
+#import "cocoa/URLFieldCell.h"
 
 
 @interface URLFieldCell ()
diff --git a/cocoa/bitmap.m b/cocoa/bitmap.m
index d2c8dfe1c..8c6afe344 100644
--- a/cocoa/bitmap.m
+++ b/cocoa/bitmap.m
@@ -18,9 +18,10 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "image/bitmap.h"
 #import "cocoa/bitmap.h"
 
+#import "image/bitmap.h"
+
 #define BITS_PER_SAMPLE (8)
 #define SAMPLES_PER_PIXEL (4)
 #define BITS_PER_PIXEL (BITS_PER_SAMPLE * SAMPLES_PER_PIXEL)
diff --git a/cocoa/font.h b/cocoa/font.h
index fc2c5c95e..b3d441102 100644
--- a/cocoa/font.h
+++ b/cocoa/font.h
@@ -19,6 +19,8 @@
 #ifndef COCOA_FONT_H
 #define COCOA_FONT_H
 
+#import "desktop/plot_style.h"
+
 void cocoa_draw_string( CGFloat x, CGFloat y, const char *bytes, size_t length, const plot_font_style_t *style );
 void cocoa_set_font_scale_factor( float newFactor );
 
diff --git a/cocoa/font.m b/cocoa/font.m
index a0298b997..5241a7a1c 100644
--- a/cocoa/font.m
+++ b/cocoa/font.m
@@ -18,17 +18,14 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include <inttypes.h>
-
-#include <assert.h>
-
-#include "css/css.h"
-#include "render/font.h"
-#include "desktop/options.h"
-
-#import "font.h"
-#import "plotter.h"
 #import "cocoa/plotter.h"
+#import "cocoa/font.h"
+
+#import "css/css.h"
+#import "desktop/options.h"
+#import "render/font.h"
+#import "desktop/plotters.h"
+
 
 static NSLayoutManager *cocoa_prepare_layout_manager( const char *string, size_t length, 
 													 const plot_font_style_t *style );
diff --git a/cocoa/gui.m b/cocoa/gui.m
index d07d4f902..a160efa32 100644
--- a/cocoa/gui.m
+++ b/cocoa/gui.m
@@ -20,11 +20,10 @@
 
 #import "cocoa/gui.h"
 #import "cocoa/plotter.h"
-
-#import "BrowserView.h"
-#import "BrowserViewController.h"
-#import "BrowserWindowController.h"
-#import "FormSelectMenu.h"
+#import "cocoa/BrowserView.h"
+#import "cocoa/BrowserViewController.h"
+#import "cocoa/BrowserWindowController.h"
+#import "cocoa/FormSelectMenu.h"
 
 #import "desktop/gui.h"
 #import "desktop/netsurf.h"
diff --git a/cocoa/plotter.m b/cocoa/plotter.m
index 2d5e814f0..63ec807a0 100644
--- a/cocoa/plotter.m
+++ b/cocoa/plotter.m
@@ -18,13 +18,13 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include "desktop/plotters.h"
-#import "desktop/plot_style.h"
-#import "utils/log.h"
-
 #import "cocoa/font.h"
 #import "cocoa/plotter.h"
 #import "cocoa/bitmap.h"
+
+#import "desktop/plotters.h"
+#import "desktop/plot_style.h"
+#import "utils/log.h"
 #import "css/utils.h"
 
 static void cocoa_plot_render_path(NSBezierPath *path,const plot_style_t *pstyle);
diff --git a/cocoa/schedule.m b/cocoa/schedule.m
index b5d5626af..8bc6296b4 100644
--- a/cocoa/schedule.m
+++ b/cocoa/schedule.m
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "desktop/browser.h"
-
 #import <Cocoa/Cocoa.h>
 
+#import "desktop/browser.h"
+
 @interface ScheduledCallback : NSObject {
 	void (*callback)( void *userData );
 	void *userData;
diff --git a/cocoa/thumbnail.m b/cocoa/thumbnail.m
index 290009e1e..8dadf080e 100644
--- a/cocoa/thumbnail.m
+++ b/cocoa/thumbnail.m
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import <Cocoa/Cocoa.h>
+
 #import "desktop/browser.h"
 #import "desktop/plotters.h"
 #import "content/urldb.h"
 #import "image/bitmap.h"
 
-#import <Cocoa/Cocoa.h>
-
 /* In platform specific thumbnail.c. */
 bool thumbnail_create(struct hlcache_handle *content, struct bitmap *bitmap,
 					  const char *url)
diff --git a/cocoa/url.m b/cocoa/url.m
index 33c8bfe61..931f459a3 100644
--- a/cocoa/url.m
+++ b/cocoa/url.m
@@ -16,12 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import <stdbool.h>
-#import <stdlib.h>
-#import "utils/url.h"
-
 #import <Cocoa/Cocoa.h>
 
+#import "utils/url.h"
+
 
 char *url_to_path(const char *url)
 {
diff --git a/cocoa/utils.m b/cocoa/utils.m
index 2b365878e..cd7ce7bfe 100644
--- a/cocoa/utils.m
+++ b/cocoa/utils.m
@@ -17,6 +17,7 @@
  */
 
 #import <Cocoa/Cocoa.h>
+
 #import "utils/utils.h"
 #import "desktop/tree_url_node.h"