diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 10657a44a90..4722b924d0c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-19  Jan Beulich  <jbeulich@novell.com>
+
+	* unwind-compat.c: Include tconfig.h and tsystem.h.
+	* unwind-dw2-fde-compat.c: Likewise.
+
 2005-05-18  Richard Henderson  <rth@redhat.com>
 
 	PR 21541
diff --git a/gcc/unwind-compat.c b/gcc/unwind-compat.c
index 26f45ac8e57..3e8c302f03a 100644
--- a/gcc/unwind-compat.c
+++ b/gcc/unwind-compat.c
@@ -29,6 +29,8 @@
    02111-1307, USA.  */
 
 #if defined (USE_GAS_SYMVER) && defined (USE_LIBUNWIND_EXCEPTIONS)
+#include "tconfig.h"
+#include "tsystem.h"
 #include "unwind.h"
 #include "unwind-dw2-fde.h"
 #include "unwind-compat.h"
diff --git a/gcc/unwind-dw2-fde-compat.c b/gcc/unwind-dw2-fde-compat.c
index 5e8c0a30c65..b5fd3ce37f6 100644
--- a/gcc/unwind-dw2-fde-compat.c
+++ b/gcc/unwind-dw2-fde-compat.c
@@ -29,6 +29,8 @@
    02111-1307, USA.  */
 
 #if defined (USE_GAS_SYMVER) && defined (USE_LIBUNWIND_EXCEPTIONS)
+#include "tconfig.h"
+#include "tsystem.h"
 #include "unwind.h"
 #include "unwind-dw2-fde.h"
 #include "unwind-compat.h"
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 50db6bb11bf..08ff5caa882 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-19  Jan Beulich  <jbeulich@novell.com>
+
+	* libsupc++/unwind-cxx.h: Include cstdlib.
+	(gcc_unreachable): #define.
+	* libsupc++/eh_personality.cc (gcc_unreachable): Remove #define.
+
 2005-05-18  Paolo Carlini  <pcarlini@suse.de>
 	    Nathan Myers  <ncm@cantrip.org>
 
diff --git a/libstdc++-v3/libsupc++/eh_personality.cc b/libstdc++-v3/libsupc++/eh_personality.cc
index ae8756b04ce..4d5ae57b8d2 100644
--- a/libstdc++-v3/libsupc++/eh_personality.cc
+++ b/libstdc++-v3/libsupc++/eh_personality.cc
@@ -35,7 +35,6 @@
 
 using namespace __cxxabiv1;
 
-#define gcc_unreachable() std::abort()
 #include "unwind-pe.h"
 
 
diff --git a/libstdc++-v3/libsupc++/unwind-cxx.h b/libstdc++-v3/libsupc++/unwind-cxx.h
index e79dd83628e..4fa4b4139f7 100644
--- a/libstdc++-v3/libsupc++/unwind-cxx.h
+++ b/libstdc++-v3/libsupc++/unwind-cxx.h
@@ -38,6 +38,8 @@
 #include <typeinfo>
 #include <exception>
 #include <cstddef>
+#include <cstdlib>
+#define gcc_unreachable() std::abort()
 #include "unwind.h"
 
 #pragma GCC visibility push(default)