diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c
index 9391419298ac086e018f3a9f70ddb936afd9989f..dba921584aa6b00ef4d4f562a2cfed5c64bd8949 100644
--- a/ghc/rts/Linker.c
+++ b/ghc/rts/Linker.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Linker.c,v 1.9 2001/01/18 10:31:38 simonmar Exp $
+ * $Id: Linker.c,v 1.10 2001/01/19 09:53:58 simonmar Exp $
  *
  * (c) The GHC Team, 2000
  *
@@ -14,12 +14,17 @@
 #include "Linker.h"
 #include "RtsUtils.h"
 
-/* These two are POSIX headers */
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
 
-/* ToDo: configure this */
+#ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
+#endif
 
 #ifdef GHCI /* endif is right at end of file */
 
@@ -129,7 +134,7 @@ static int ocResolve_PEi386     ( ObjectCode* oc );
       SymX(stg_sel_12_upd_info)			\
       SymX(stg_upd_frame_info)			\
       SymX(stg_seq_frame_info)			\
-      SymX(stg_CAF_BLACKHOLE_info)		\
+      SymX(stg_BLACKHOLE_STATIC_info)		\
       SymX(stg_IND_STATIC_info)			\
       SymX(stg_EMPTY_MVAR_info)			\
       SymX(stg_MUT_ARR_PTRS_FROZEN_info)	\