diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0dc127dad57..3c7cf35bb77 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-05  David O'Brien  <obrien@FreeBSD.org>
+
+	* config.gcc, config/sparc/bsd.h:  Do not directly include
+	sparc/sparc.h.  Instead do it via tm_file.
+
 2001-06-05  Richard Henderson  <rth@redhat.com>
 
 	* dwarf2.h (DW_EH_PE_aligned): New.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 600a693d857..df7f574338c 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2811,7 +2811,7 @@ sparc-*-openbsd*)
 	use_collect2=yes
 	;;
 sparc-*-bsd*)
-	tm_file=sparc/bsd.h
+	tm_file="${tm_file} sparc/bsd.h"
 	;;
 sparc-*-chorusos*)
 	tm_file="sparc/sol2.h sparc/elf.h sparc/chorus.h"
diff --git a/gcc/config/sparc/bsd.h b/gcc/config/sparc/bsd.h
index 761abe2671b..41f83081399 100644
--- a/gcc/config/sparc/bsd.h
+++ b/gcc/config/sparc/bsd.h
@@ -1,5 +1,3 @@
-#include "sparc/sparc.h"
-
 #undef LIB_SPEC
 #define LIB_SPEC	"%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"