diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 9fb033eab1..b71ab52300 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,7 @@
 2009-10-14	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* libcsupport/include/rtems/libcsupport.h: Remove RTEMS_UNIX, hpux.
+	Fix extern "C" {}.
 	* libfs/src/imfs/ioman.c: Remove RTEMS_UNIX, __linux__.
 
 2009-10-14	Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/cpukit/libcsupport/include/rtems/libcsupport.h b/cpukit/libcsupport/include/rtems/libcsupport.h
index 5c9081c353..63ddd4fa91 100644
--- a/cpukit/libcsupport/include/rtems/libcsupport.h
+++ b/cpukit/libcsupport/include/rtems/libcsupport.h
@@ -20,14 +20,13 @@
 #ifndef _RTEMS_RTEMS_LIBCSUPPORT_H
 #define _RTEMS_RTEMS_LIBCSUPPORT_H
 
+#include <sys/types.h>
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdint.h>
-
-#include <sys/types.h>
-
 void RTEMS_Malloc_Initialize(
   void *heap_begin,
   uintptr_t heap_size,
@@ -50,12 +49,7 @@ bool newlib_create_hook(
   rtems_tcb *creating_task
 );
 
-#if defined(RTEMS_UNIX) && !defined(hpux)
-  void newlib_begin_hook(rtems_tcb *current_task);
-  #define __RTEMS_NEWLIB_BEGIN newlib_begin_hook
-#else
-  #define __RTEMS_NEWLIB_BEGIN 0
-#endif
+#define __RTEMS_NEWLIB_BEGIN 0
 
 void newlib_delete_hook(
   rtems_tcb *current_task,