diff -Naur emacs.orig/src/keyboard.c emacs/src/keyboard.c
--- emacs.orig/src/keyboard.c	2007-09-12 22:00:06.000000000 +0200
+++ emacs/src/keyboard.c	2007-09-12 21:53:35.000000000 +0200
@@ -108,8 +108,6 @@
 #define KBD_BUFFER_SIZE 4096
 #endif	/* No X-windows */
 
-#define abs(x)		((x) >= 0 ? (x) : -(x))
-
 /* Following definition copied from eval.c */
 
 struct backtrace
diff -Naur emacs.orig/src/lisp.h emacs/src/lisp.h
--- emacs.orig/src/lisp.h	2007-09-12 22:00:06.000000000 +0200
+++ emacs/src/lisp.h	2007-09-12 22:05:58.000000000 +0200
@@ -3389,6 +3389,12 @@
 #define min(a, b)	((a) < (b) ? (a) : (b))
 #define max(a, b)	((a) > (b) ? (a) : (b))
 
+/* Make sure we have abs defined */
+
+#if !defined(abs)
+#define abs(x)		((x) < 0 ? -(x) : (x))
+#endif
+
 /* Return a fixnum or float, depending on whether VAL fits in a Lisp
    fixnum.  */
 
diff -Naur emacs.orig/src/sound.c emacs/src/sound.c
--- emacs.orig/src/sound.c	2007-09-12 22:00:06.000000000 +0200
+++ emacs/src/sound.c	2007-09-12 21:53:47.000000000 +0200
@@ -96,9 +96,6 @@
 
 #endif /* WINDOWSNT */
 
-/* BEGIN: Common Definitions */
-#define abs(X)    ((X) < 0 ? -(X) : (X))
-
 /* Symbols.  */
 
 extern Lisp_Object QCfile, QCdata;
diff -Naur emacs.orig/src/w32term.c emacs/src/w32term.c
--- emacs.orig/src/w32term.c	2007-09-12 22:00:06.000000000 +0200
+++ emacs/src/w32term.c	2007-09-12 21:54:03.000000000 +0200
@@ -58,8 +58,6 @@
 #include "composite.h"
 #include "coding.h"
 
-#define abs(x)	((x) < 0 ? -(x) : (x))
-
 
 /* Fringe bitmaps.  */
 
diff -Naur emacs.orig/src/xfaces.c emacs/src/xfaces.c
--- emacs.orig/src/xfaces.c	2007-09-12 22:00:06.000000000 +0200
+++ emacs/src/xfaces.c	2007-09-12 21:54:14.000000000 +0200
@@ -267,8 +267,6 @@
 
 #include <ctype.h>
 
-#define abs(X)		((X) < 0 ? -(X) : (X))
-
 /* Number of pt per inch (from the TeXbook).  */
 
 #define PT_PER_INCH 72.27
diff -Naur emacs.orig/src/xterm.c emacs/src/xterm.c
--- emacs.orig/src/xterm.c	2007-09-12 22:00:06.000000000 +0200
+++ emacs/src/xterm.c	2007-09-12 21:54:22.000000000 +0200
@@ -154,8 +154,6 @@
 #endif
 #endif
 
-#define abs(x)	((x) < 0 ? -(x) : (x))
-
 /* Default to using XIM if available.  */
 #ifdef USE_XIM
 int use_xim = 1;