--- a/src/core/geometry_type.hpp	Sun Dec 23 13:31:24 2007 +0000
+++ b/src/core/geometry_type.hpp	Sun Dec 23 14:06:03 2007 +0000
@@ -5,6 +5,11 @@
 #ifndef GEOMETRY_TYPE_HPP
 #define GEOMETRY_TYPE_HPP
 
+#if defined(__AMIGA__)
+	/* AmigaOS already has a Point declared */
+	#define Point OTTD_Point
+#endif /* __AMIGA__ */
+
 struct Point {
 	int x;
 	int y;

--- a/src/core/random_func.hpp	Sun Dec 23 13:31:24 2007 +0000
+++ b/src/core/random_func.hpp	Sun Dec 23 14:06:03 2007 +0000
@@ -5,6 +5,11 @@
 #ifndef RANDOM_FUNC_HPP
 #define RANDOM_FUNC_HPP
 
+#if defined(__APPLE__)
+	/* Apple already has Random declared */
+	#define Random OTTD_Random
+#endif /* __APPLE__ */
+
 /**************
  * Warning: DO NOT enable this unless you understand what it does
  *

--- a/src/stdafx.h	Sun Dec 23 13:31:24 2007 +0000
+++ b/src/stdafx.h	Sun Dec 23 14:06:03 2007 +0000
@@ -339,14 +339,8 @@
 #if defined(__APPLE__)
 	#define GetString OTTD_GetString
 	#define DrawString OTTD_DrawString
-	#define Random OTTD_Random
 	#define CloseConnection OTTD_CloseConnection
-#endif /* __APPLE */
-
-#if defined(__AMIGA__)
-	/* it seems AmigaOS already have a Point declared */
-	#define Point OTTD_AMIGA_POINT
-#endif
+#endif /* __APPLE__ */
 
 #if !defined(STRGEN)
 	/* In strgen error is not fatal and returns */