--- a/src/video/cocoa/cocoa_v.mm	Sun Dec 23 14:06:03 2007 +0000
+++ b/src/video/cocoa/cocoa_v.mm	Sun Dec 23 18:08:39 2007 +0000
@@ -57,12 +57,11 @@
 #include "../../openttd.h"
 #include "../../debug.h"
 #include "../../variables.h"
+#include "../../core/geometry_type.hpp"
 #include "cocoa_v.h"
 #include "../../blitter/factory.hpp"
 #include "../../fileio.h"
-
-#undef Point
-#undef Rect
+#include "../../gfx_func.h"
 
 
 @interface OTTDMain : NSObject
@@ -199,7 +198,7 @@
 static void QZ_UpdateVideoModes()
 {
 	uint i, count;
-	OTTDPoint modes[32];
+	OTTD_Point modes[32];
 
 	assert(_cocoa_subdriver != NULL);