--- mouse.c.orig	2012-10-14 13:17:02.000000000 -0700
+++ mouse.c	2012-10-14 13:17:37.000000000 -0700
@@ -1056,7 +1056,7 @@ choose_residence (void)
    and set to 1 if the existing transport if the more expensive sort
    (e.g. GROUP_RAIL when overwriting GROUP_ROAD).
 */
-inline int
+static inline int
 mt_erase(int x, int y)
 {
     if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
@@ -1093,7 +1093,7 @@ mt_erase(int x, int y)
     return 0;
 }
 
-inline int
+static inline int
 mt_temp(int x, int y)
 {
     if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
@@ -1127,7 +1127,7 @@ mt_temp(int x, int y)
     return 0;
 }
 
-inline int
+static inline int
 mt_perm(int x, int y)
 {
     /* By now, it has already been mt_erase()'d */
--- pixmap.c.orig	2012-10-14 13:19:05.000000000 -0700
+++ pixmap.c	2012-10-14 13:19:33.000000000 -0700
@@ -390,7 +390,7 @@ resize_pixmap (int new_width, int new_he
 		  likes it in the file.  Still need to fix this in autoconf,
                   but for now this will do. */
 #if !defined (WIN32)
-inline int 
+int 
 pixmap_index (int x, int y)
 {
     return y*pixmap_width + x;