diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a0eaa028188121888796cbf25904b8f9fe0208e..b4ae40a792556f1a4e2bc25ec505210b1ed0b347 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 Mon Jan  1 07:38:33 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
+	* config.gcc (sparc-*-elf): Include sparc/sol2.h.
+	(sparc-*-rtems*): Include sparc/sol2.h and sparc/elf.h.
+	(sparclite-*-elf*, sparc86x-*-elf*): Likewise.
+	* config/sparc/elf.h: No longer include sol2.h.
+	* config/sparc/lifeelf.h: No longer include sparc/elf.h.
+	* config/sparc/rtemself.h, config/sparc/sp86x-elf.h: Likewise.
+
 	* config/sparc/sparc.md: Test TARGET_ARCH64 instead of TARGET_PTR64.
 
 2001-01-01  Michael Hayes  <mhayes@redhat.com>
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 13647bf5e05e4fae8763f4db89604e7abd94bd8b..0d55123bf437ebc953ad43f41770919e424ee8a7 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2973,7 +2973,7 @@ sparc-*-bsd*)
 	tm_file=sparc/bsd.h
 	;;
 sparc-*-elf*)
-	tm_file=sparc/elf.h
+	tm_file="sparc/sol2.h sparc/elf.h"
 	tmake_file=sparc/t-elf
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	#float_format=i128
@@ -3025,7 +3025,7 @@ sparc-*-rtemsaout*)
 	fi
 	;;
 sparc-*-rtems*|sparc-*-rtemself*)
-	tm_file="sparc/rtemself.h"
+	tm_file="sparc/sol2.h sparc/elf.h sparc/rtemself.h"
 	tmake_file="sparc/t-elf t-rtems"
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	#float_format=i128
@@ -3185,7 +3185,7 @@ sparclite-*-aout*)
 	tmake_file=sparc/t-sparclite
 	;;
 sparclite-*-elf*)
-	tm_file="sparc/liteelf.h"
+	tm_file="sparc/sol2.h sparc/elf.h sparc/liteelf.h"
 	tmake_file=sparc/t-sparclite
         extra_parts="crtbegin.o crtend.o"
 	;;
@@ -3194,7 +3194,7 @@ sparc86x-*-aout*)
 	tmake_file=sparc/t-sp86x
 	;;
 sparc86x-*-elf*)	
-	tm_file="sparc/sp86x-elf.h"
+	tm_file="sparc/sol2.h sparc./elf.h sparc/sp86x-elf.h"
 	tmake_file=sparc/t-sp86x
         extra_parts="crtbegin.o crtend.o"
 	;;
diff --git a/gcc/config/sparc/elf.h b/gcc/config/sparc/elf.h
index f07dcd83c1693b2a7cd2106a47d35f526334dedf..9d14659fcf9e46a2c516184cb8862e1dd80b2a37 100644
--- a/gcc/config/sparc/elf.h
+++ b/gcc/config/sparc/elf.h
@@ -19,8 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "sol2.h"
-
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dsparc -D__elf__ -Acpu=sparc -Amachine=sparc"
 
diff --git a/gcc/config/sparc/liteelf.h b/gcc/config/sparc/liteelf.h
index 6eb183ac73451fa5893d5bfd0eb773540c1eba22..0181d66fd6a6dc9f0b5740d7e6fc86c2e1db0cfe 100644
--- a/gcc/config/sparc/liteelf.h
+++ b/gcc/config/sparc/liteelf.h
@@ -19,8 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "sparc/elf.h"
-
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__sparc__ -D__sparclite__ -Acpu=sparc -Amachine=sparc"
 
diff --git a/gcc/config/sparc/rtemself.h b/gcc/config/sparc/rtemself.h
index 8b25c4b2d6a99d8dcb9c080d5fd3857a14f11237..62277abe79d650e6c7c131a0341f66a418abefda 100644
--- a/gcc/config/sparc/rtemself.h
+++ b/gcc/config/sparc/rtemself.h
@@ -19,8 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "sparc/elf.h"
-
 /* Specify predefined symbols in preprocessor.  */
 
 #undef CPP_PREDEFINES
@@ -35,4 +33,3 @@ Boston, MA 02111-1307, USA.  */
 /* Get machine-independent configuration parameters for RTEMS.  */
 #include <rtems.h>
 
-/* end of sparc/rtemself.h */
diff --git a/gcc/config/sparc/sp86x-elf.h b/gcc/config/sparc/sp86x-elf.h
index f09d27d7dbe84a29a2170d48f69ef75bd7cbc3a6..412738d98ac0a09591bdc76268e20b8f7db0a7a8 100644
--- a/gcc/config/sparc/sp86x-elf.h
+++ b/gcc/config/sparc/sp86x-elf.h
@@ -19,8 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "sparc/elf.h"
-
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__sparc__ -D__sparclite86x__ -Acpu=sparc -Amachine=sparc"