diff --git a/ghc/lib/std/PrelAddr.lhs b/ghc/lib/std/PrelAddr.lhs
index 8bd90f2e46391778df13016ba3ce9d2e24d17d47..3c9fb0a02ffa5a2a70aee36ed44d48a153c20a26 100644
--- a/ghc/lib/std/PrelAddr.lhs
+++ b/ghc/lib/std/PrelAddr.lhs
@@ -5,7 +5,7 @@
 \section[PrelAddr]{Module @PrelAddr@}
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelAddr (
 	  Addr(..)
diff --git a/ghc/lib/std/PrelArr.lhs b/ghc/lib/std/PrelArr.lhs
index 6ee1418e8cbb4f70882aa080f35b370a76d51ac8..e930bad39832614469057b945f7862bc56373b4c 100644
--- a/ghc/lib/std/PrelArr.lhs
+++ b/ghc/lib/std/PrelArr.lhs
@@ -9,7 +9,7 @@ types and operations.
 For byte-arrays see @PrelByteArr@.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelArr where
 
diff --git a/ghc/lib/std/PrelArrExtra.lhs b/ghc/lib/std/PrelArrExtra.lhs
index 69d8fb12ea5be703038825785e667aa956d922d3..a7769b88fce8ed10df39fcc5685b5cb94d7da8f2 100644
--- a/ghc/lib/std/PrelArrExtra.lhs
+++ b/ghc/lib/std/PrelArrExtra.lhs
@@ -9,7 +9,7 @@ to compile.  So as not to compile the whole of PrelArr with
 module.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelArrExtra where
 
diff --git a/ghc/lib/std/PrelBase.lhs b/ghc/lib/std/PrelBase.lhs
index 7ed127caeb88a23174bfa45ffcd7b4531075030c..6ba7618c7edd400d0d458f044e241c477e920864 100644
--- a/ghc/lib/std/PrelBase.lhs
+++ b/ghc/lib/std/PrelBase.lhs
@@ -71,7 +71,7 @@ Other Prelude modules are much easier with fewer complex dependencies.
 
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelBase
 	(
diff --git a/ghc/lib/std/PrelByteArr.lhs b/ghc/lib/std/PrelByteArr.lhs
index f51ad172a9306af9b57d06e462ea01044fa21c6e..f2a1b10596a8886e44b00f0efa0d2a5cb6f97302 100644
--- a/ghc/lib/std/PrelByteArr.lhs
+++ b/ghc/lib/std/PrelByteArr.lhs
@@ -6,7 +6,7 @@
 Byte-arrays are flat arrays of non-pointers only.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelByteArr where
 
diff --git a/ghc/lib/std/PrelConc.lhs b/ghc/lib/std/PrelConc.lhs
index d75bbca426dee3791207b0909988a566ea3fc78c..bef86b663b8bda4adfb74733b20e0803a6eb9c6b 100644
--- a/ghc/lib/std/PrelConc.lhs
+++ b/ghc/lib/std/PrelConc.lhs
@@ -7,7 +7,7 @@
 Basic concurrency stuff
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelConc
 	( ThreadId(..)
diff --git a/ghc/lib/std/PrelDynamic.lhs b/ghc/lib/std/PrelDynamic.lhs
index b5939e45ae888640c292ad847a465bc81c8d1530..b90fafe36cbb393d5a7e4dfff3ff96eb4c9b19ef 100644
--- a/ghc/lib/std/PrelDynamic.lhs
+++ b/ghc/lib/std/PrelDynamic.lhs
@@ -7,7 +7,7 @@ Dynamic visible here.  The rest of the operations on Dynamics are
 available in exts/Dynamic.lhs.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 #ifndef __HUGS__
 module PrelDynamic where
diff --git a/ghc/lib/std/PrelEnum.lhs b/ghc/lib/std/PrelEnum.lhs
index 64b599c6bc419e82492ac24824e524f4d35ac2c3..f4d37eea7729cc3c4e7de56a0ddedfc6ac8f85ae 100644
--- a/ghc/lib/std/PrelEnum.lhs
+++ b/ghc/lib/std/PrelEnum.lhs
@@ -6,7 +6,7 @@
 Instances of Bounded for various datatypes.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelEnum(
 	Bounded(..), Enum(..),
diff --git a/ghc/lib/std/PrelErr.lhs b/ghc/lib/std/PrelErr.lhs
index 812a369999df734ffabfc6f4977103904a7e709a..c0269cd3a349ca1d1e9340778a73711c93483b2c 100644
--- a/ghc/lib/std/PrelErr.lhs
+++ b/ghc/lib/std/PrelErr.lhs
@@ -12,7 +12,7 @@ We cannot define these functions in a module where they might be used
 with what the typechecker figures out.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 module PrelErr 
        (
          irrefutPatError
diff --git a/ghc/lib/std/PrelException.lhs b/ghc/lib/std/PrelException.lhs
index 8b2d17bdc5c106dc74dc9248c3daf6e4c6e100e0..d30a4f33bcc4af03513c8e1ae309cef2ed07f185 100644
--- a/ghc/lib/std/PrelException.lhs
+++ b/ghc/lib/std/PrelException.lhs
@@ -1,5 +1,5 @@
 % -----------------------------------------------------------------------------
-% $Id: PrelException.lhs,v 1.18 2000/04/13 08:58:27 simonmar Exp $
+% $Id: PrelException.lhs,v 1.19 2000/04/14 15:28:24 rrt Exp $
 %
 % (c) The GRAP/AQUA Project, Glasgow University, 1998
 %
@@ -7,7 +7,7 @@
 Exceptions and exception-handling functions.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 #ifndef __HUGS__
 module PrelException where
diff --git a/ghc/lib/std/PrelFloat.lhs b/ghc/lib/std/PrelFloat.lhs
index a1be918f38e019268976ccac4db08a60ca183592..250da00527eab360b36d671f10c7b8b53fcb1404 100644
--- a/ghc/lib/std/PrelFloat.lhs
+++ b/ghc/lib/std/PrelFloat.lhs
@@ -16,7 +16,7 @@ and the classes
 
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 #include "../includes/ieee-flpt.h"
 
diff --git a/ghc/lib/std/PrelForeign.lhs b/ghc/lib/std/PrelForeign.lhs
index 87905fb5ad5bbd06435c74ae5dd57f125817a378..57af782f56989e8de792cae856b6d2afe269e99d 100644
--- a/ghc/lib/std/PrelForeign.lhs
+++ b/ghc/lib/std/PrelForeign.lhs
@@ -5,7 +5,7 @@
 \section[Foreign]{Module @Foreign@}
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelForeign (
 	module PrelForeign,
diff --git a/ghc/lib/std/PrelHandle.lhs b/ghc/lib/std/PrelHandle.lhs
index 1731cbf4ce8e2ff48951b301f97344f2a27dd9f3..5659ee9be45d4657209b231243696c7cc90079a1 100644
--- a/ghc/lib/std/PrelHandle.lhs
+++ b/ghc/lib/std/PrelHandle.lhs
@@ -8,7 +8,7 @@ This module defines Haskell {\em handles} and the basic operations
 which are supported for them.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude -#include "cbits/stgio.h" #-}
+{-# OPTIONS -fno-implicit-prelude -#include "cbits/stgio.h" #-}
 #include "cbits/stgerror.h"
 
 #ifndef __HUGS__ /* Hugs just includes this in PreludeBuiltin so no header needed */
diff --git a/ghc/lib/std/PrelHugs.lhs b/ghc/lib/std/PrelHugs.lhs
index 897b6ea2fdbe489d4b2242da67b8dc9360ed03d9..805f7b7dc8d0ed443ba1a101bd408154c44f88e3 100644
--- a/ghc/lib/std/PrelHugs.lhs
+++ b/ghc/lib/std/PrelHugs.lhs
@@ -3,7 +3,7 @@
 %
 
 \begin{code}
-{-# OPTIONS -fno-implicit-prelude -fcompiling-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelHugs (
    hugsprimPmInt,
diff --git a/ghc/lib/std/PrelIO.lhs b/ghc/lib/std/PrelIO.lhs
index c151a17329797095b9f225a9facf5324afdad45a..43e0c631bfa58b733b15ebf4ab459d2f412e7d02 100644
--- a/ghc/lib/std/PrelIO.lhs
+++ b/ghc/lib/std/PrelIO.lhs
@@ -10,7 +10,7 @@ module IO.
 
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude -#include "cbits/stgio.h" #-}
+{-# OPTIONS -fno-implicit-prelude -#include "cbits/stgio.h" #-}
 
 module PrelIO where
 
diff --git a/ghc/lib/std/PrelIOBase.lhs b/ghc/lib/std/PrelIOBase.lhs
index e83ddd5b8f1633c476b2611f454185e2bd8abc02..d0372759a06ad5444085b2c2d02c457c40823b30 100644
--- a/ghc/lib/std/PrelIOBase.lhs
+++ b/ghc/lib/std/PrelIOBase.lhs
@@ -1,5 +1,5 @@
 % -----------------------------------------------------------------------------
-% $Id: PrelIOBase.lhs,v 1.22 2000/04/12 17:33:16 simonmar Exp $
+% $Id: PrelIOBase.lhs,v 1.23 2000/04/14 15:28:24 rrt Exp $
 % 
 % (c) The AQUA Project, Glasgow University, 1994-1998
 %
@@ -10,7 +10,7 @@ Definitions for the @IO@ monad and its friends.  Everything is exported
 concretely; the @IO@ module itself exports abstractly.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude -#include "cbits/stgio.h" #-}
+{-# OPTIONS -fno-implicit-prelude -#include "cbits/stgio.h" #-}
 #include "cbits/stgerror.h"
 #include "config.h"
 
diff --git a/ghc/lib/std/PrelList.lhs b/ghc/lib/std/PrelList.lhs
index 7b85297ee481e5f6b152f63049bbda632463a4cd..1ea90d6d130b8a1cba49eef5419d13b24d72089d 100644
--- a/ghc/lib/std/PrelList.lhs
+++ b/ghc/lib/std/PrelList.lhs
@@ -7,7 +7,7 @@
 The List data type and its operations
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelList (
    [] (..),
diff --git a/ghc/lib/std/PrelMaybe.lhs b/ghc/lib/std/PrelMaybe.lhs
index 16383debc95f08405288993adc621e9ca81add1a..008a5444e5bdf62458397176fe331da384e25e3c 100644
--- a/ghc/lib/std/PrelMaybe.lhs
+++ b/ghc/lib/std/PrelMaybe.lhs
@@ -6,7 +6,7 @@
 The @Maybe@ type.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelMaybe where
 
diff --git a/ghc/lib/std/PrelNum.lhs b/ghc/lib/std/PrelNum.lhs
index 92ce9ae7052b0126bdd5dd1be5b9f0e5c17748ea..1ff4c98f28854a9c716adb3eb0e8f492256e108f 100644
--- a/ghc/lib/std/PrelNum.lhs
+++ b/ghc/lib/std/PrelNum.lhs
@@ -14,7 +14,7 @@ and the type
 
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelNum where
 
diff --git a/ghc/lib/std/PrelPack.lhs b/ghc/lib/std/PrelPack.lhs
index 6301060d52a4fef56e1e68a18ba74a17a657a865..934ffa7b4bd49e651dd9bed253c3cc6a1c7498ba 100644
--- a/ghc/lib/std/PrelPack.lhs
+++ b/ghc/lib/std/PrelPack.lhs
@@ -11,7 +11,7 @@ The programmer level view of packed strings is provided by a GHC
 system library PackedString.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelPack
        (
diff --git a/ghc/lib/std/PrelRead.lhs b/ghc/lib/std/PrelRead.lhs
index 0b4c1562ebe683bf97a76d084412f8e8b65b6927..3f648650ed135e5736b039f2f0ee7bb5f1859bb7 100644
--- a/ghc/lib/std/PrelRead.lhs
+++ b/ghc/lib/std/PrelRead.lhs
@@ -7,7 +7,7 @@
 Instances of the Read class.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelRead where
 
diff --git a/ghc/lib/std/PrelReal.lhs b/ghc/lib/std/PrelReal.lhs
index 396b5c8e969088cb98875df489cad6c6711a1a4f..e6d64d5eedcb820753f01bd0f35e49e03576ece4 100644
--- a/ghc/lib/std/PrelReal.lhs
+++ b/ghc/lib/std/PrelReal.lhs
@@ -17,7 +17,7 @@ and the classes
 
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelReal where
 
diff --git a/ghc/lib/std/PrelST.lhs b/ghc/lib/std/PrelST.lhs
index 1e2a4738d1d98963cea789718ffce96753de9c1b..77e337ae7d6ba2d37ca1078c6a0189b68ff966bd 100644
--- a/ghc/lib/std/PrelST.lhs
+++ b/ghc/lib/std/PrelST.lhs
@@ -4,7 +4,7 @@
 \section[PrelST]{The @ST@ monad}
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelST where
 
diff --git a/ghc/lib/std/PrelShow.lhs b/ghc/lib/std/PrelShow.lhs
index 837f94f75a485fac6365a27baef486aa4aee4e59..44e336482d5ffad51b2e04a4755e8c3b66d37870 100644
--- a/ghc/lib/std/PrelShow.lhs
+++ b/ghc/lib/std/PrelShow.lhs
@@ -5,7 +5,7 @@
 
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelShow
 	(
diff --git a/ghc/lib/std/PrelStable.lhs b/ghc/lib/std/PrelStable.lhs
index 09dc0dc9f41318c3b7ead2cadf39ca77b99021d6..8f6053dda71e6a822f8274a699a0e30077808b25 100644
--- a/ghc/lib/std/PrelStable.lhs
+++ b/ghc/lib/std/PrelStable.lhs
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------------
-% $Id: PrelStable.lhs,v 1.4 2000/04/10 16:02:58 simonpj Exp $
+% $Id: PrelStable.lhs,v 1.5 2000/04/14 15:28:24 rrt Exp $
 %
 % (c) The GHC Team, 1992-1999
 %
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelStable 
 	( StablePtr(..)
diff --git a/ghc/lib/std/PrelTup.lhs b/ghc/lib/std/PrelTup.lhs
index 68e4dc82af7741b03cb803a339ddf2c318d16d5c..b1f143a39432806024af7847a95d8ba26aadc2a0 100644
--- a/ghc/lib/std/PrelTup.lhs
+++ b/ghc/lib/std/PrelTup.lhs
@@ -7,7 +7,7 @@
 This modules defines the typle data types.
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelTup where
 
diff --git a/ghc/lib/std/PrelWeak.lhs b/ghc/lib/std/PrelWeak.lhs
index 9548a193b1285f2e80edb27fdb40f6755a73415b..97a7bf5f854c9ac74e1fb7a47e61d095459d9040 100644
--- a/ghc/lib/std/PrelWeak.lhs
+++ b/ghc/lib/std/PrelWeak.lhs
@@ -5,7 +5,7 @@
 \section[PrelWeak]{Module @PrelWeak@}
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module PrelWeak where
 
diff --git a/ghc/lib/std/Prelude.lhs b/ghc/lib/std/Prelude.lhs
index 01e55fc8e12a5ac6b0f1b7434058c87106623c43..7a09c42dc2e43b1ae6d114422acd21b8a48e824f 100644
--- a/ghc/lib/std/Prelude.lhs
+++ b/ghc/lib/std/Prelude.lhs
@@ -3,7 +3,7 @@ special names such as () and -> shouldn't be resolved to Prelude.()
 and Prelude.-> (as they are normally). -- SDM 8/10/97
 
 \begin{code}
-{-# OPTIONS -fcompiling-prelude -fno-implicit-prelude #-}
+{-# OPTIONS -fno-implicit-prelude #-}
 
 module Prelude (