diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b832f796fed0..04695cbde965 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-25  Andrew Haley  <aph@redhat.com>
+
+	* java/lang/natClassLoader.cc: Don't include link.h or dladdr.h.
+	* boehm.cc: Don't include link.h.
+	(_Jv_RegisterLibForGc): Cast away const when calling dladdr().
+
 2006-04-24  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/natClass.cc (_Jv_getInterfaceMethod): Skip <clinit>.
diff --git a/libjava/boehm.cc b/libjava/boehm.cc
index 9ee633b34c35..d939f41497ef 100644
--- a/libjava/boehm.cc
+++ b/libjava/boehm.cc
@@ -36,7 +36,6 @@ details.  */
 #undef _GNU_SOURCE
 #define _GNU_SOURCE
 #include <dlfcn.h>
-#include <link.h>
 #endif
 
 extern "C"
@@ -664,8 +663,8 @@ _Jv_RegisterLibForGc (const void *p __attribute__ ((__unused__)))
 {
 #ifdef HAVE_DLFCN_H
   Dl_info info;
-  
-  if (dladdr (p, &info) != 0)
+
+  if (dladdr (const_cast<void *>(p), &info) != 0)
     {
       filename_node **node = find_file (info.dli_fname);
       if (! *node)
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index e6cfca230370..87419c3e88fa 100644
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -45,11 +45,6 @@ details.  */
 #include <gnu/gcj/runtime/BootClassLoader.h>
 #include <gnu/gcj/runtime/SystemClassLoader.h>
 
-#undef _GNU_SOURCE
-#define _GNU_SOURCE
-#include <dlfcn.h>
-#include <link.h>
-
 // Size of local hash table.
 #define HASH_LEN 1013