diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 0d2b3786c3..078de3cb20 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-21  Doug Evans  <dje@google.com>
+
+	* linux-arm-low.c: Remove redundant include of gdb_proc_service.h.
+	Only include elf.h if gdb_proc_service.h didn't include linux/elf.h.
+
 2010-01-21  Pedro Alves  <pedro@codesourcery.com>
 
 	* proc-service.c (ps_lgetregs): Don't refetch registers from the
diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
index 965b02926e..e0afd3a6ce 100644
--- a/gdb/gdbserver/linux-arm-low.c
+++ b/gdb/gdbserver/linux-arm-low.c
@@ -20,11 +20,13 @@
 #include "server.h"
 #include "linux-low.h"
 
+/* Don't include elf.h if linux/elf.h got included by gdb_proc_service.h.
+   On Bionic elf.h and linux/elf.h have conflicting definitions.  */
+#ifndef ELFMAG0
 #include <elf.h>
+#endif
 #include <sys/ptrace.h>
 
-#include "gdb_proc_service.h"
-
 /* Defined in auto-generated files.  */
 void init_registers_arm (void);
 void init_registers_arm_with_iwmmxt (void);