--- a/src/video/cocoa/event.mm	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/video/cocoa/event.mm	Wed Jan 09 18:11:12 2008 +0000
@@ -8,6 +8,9 @@
 
 #ifdef WITH_COCOA
 
+#define MAC_OS_X_VERSION_MIN_REQUIRED    MAC_OS_X_VERSION_10_3
+#include <AvailabilityMacros.h>
+
 #import <Cocoa/Cocoa.h>
 #import <sys/time.h> /* gettimeofday */
 #import <sys/param.h> /* for MAXPATHLEN */
@@ -35,17 +38,15 @@
 #include "../../stdafx.h"
 #include "../../openttd.h"
 #include "../../debug.h"
-#include "../../macros.h"
 #include "../../os/macosx/splash.h"
 #include "../../variables.h"
-#include "../../gfx.h"
+#include "../../core/geometry_type.hpp"
 #include "cocoa_v.h"
 #include "cocoa_keys.h"
 #include "../../blitter/factory.hpp"
-#include "../../fileio.h"
+#include "../../gfx_func.h"
+#include "../../network/network.h"
 
-#undef Point
-#undef Rect
 
 /* Right Mouse Button Emulation enum */
 enum {
@@ -433,7 +434,6 @@
 	switch ([event type]) {
 		case NSMouseMoved:
 		case NSOtherMouseDragged:
-		case NSRightMouseDragged:
 		case NSLeftMouseDragged:
 			pt = _cocoa_subdriver->GetMouseLocation(event);
 			if (!_cocoa_subdriver->MouseIsInsideView(&pt) &&
@@ -447,6 +447,12 @@
 			QZ_MouseMovedEvent((int)pt.x, (int)pt.y);
 			break;
 
+		case NSRightMouseDragged:
+			pt = _cocoa_subdriver->GetMouseLocation(event);
+			QZ_HideMouse();
+			QZ_MouseMovedEvent((int)pt.x, (int)pt.y);
+			break;
+
 		case NSLeftMouseDown:
 		{
 			uint32 keymask = 0;