diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6dbb4369e78..9acad65636e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* unwind-dw2-fde-glibc.c: Include <elf.h> for DT_CONFIG.
+	Include <link.h> only if USE_PT_GNU_EH_FRAME is defined.
+
 2010-09-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config.gcc: Don't append t-android for Android targets.
diff --git a/gcc/unwind-dw2-fde-glibc.c b/gcc/unwind-dw2-fde-glibc.c
index b8a7312f501..a762d875c9e 100644
--- a/gcc/unwind-dw2-fde-glibc.c
+++ b/gcc/unwind-dw2-fde-glibc.c
@@ -33,7 +33,7 @@
 #include "tconfig.h"
 #include "tsystem.h"
 #ifndef inhibit_libc
-#include <link.h>
+#include <elf.h>		/* Get DT_CONFIG.  */
 #endif
 #include "coretypes.h"
 #include "tm.h"
@@ -59,6 +59,8 @@
 
 #if defined(USE_PT_GNU_EH_FRAME)
 
+#include <link.h>
+
 #ifndef __RELOC_POINTER
 # define __RELOC_POINTER(ptr, base) ((ptr) + (base))
 #endif