diff --git a/macros.h b/macros.h
index bd5604419b..69364cfcc5 100644
--- a/macros.h
+++ b/macros.h
@@ -81,16 +81,12 @@ enum {
 
 #define TILE_ASSERT(x) assert( TILE_MASK(x) == (x) );
 
-extern uint SafeTileAdd(uint x, int add, const char *exp, const char *file, int line);
+uint SafeTileAdd(uint x, int add, const char *exp, const char *file, int line);
 
 #if !defined(_DEBUG)
 #	define TILE_ADD(x,y) ((x)+(y))
 #else
-#	if defined(__GNUC__)
-#		define TILE_ADD(x,y) (SafeTileAdd((x),(y), #x ", " #y,  __FILE__, __LINE__))
-#	else
-#		define TILE_ADD(x,y) (SafeTileAdd((x),(y), #x ## ", " ## #y,  __FILE__, __LINE__))
-#	endif
+#	define TILE_ADD(x,y) (SafeTileAdd((x),(y), #x ", " #y,  __FILE__, __LINE__))
 #endif
 
 #define TILE_ADDXY(tile, x, y) TILE_ADD(tile, TILE_XY(x,y))
diff --git a/misc.c b/misc.c
index c37122df79..81aa6601ff 100644
--- a/misc.c
+++ b/misc.c
@@ -730,7 +730,7 @@ int FindFirstBit(uint32 value)
 }
 
 
-extern uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, int line)
+uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, int line)
 {
 	uint x = TileX(tile) + (signed char)(add & 0xFF);
 	uint y = TileY(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80);