14 files changed, 7 insertions, 20 deletions
diff --git a/compiler/main/CmdLineParser.hs b/compiler/main/CmdLineParser.hs
index c7ad66e922..8ec2f6a3ef 100644
--- a/compiler/main/CmdLineParser.hs
+++ b/compiler/main/CmdLineParser.hs
@@ -14,8 +14,6 @@ module CmdLineParser (
         CmdLineP(..), getCmdLineState, putCmdLineState
   ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import Util
diff --git a/compiler/main/Constants.lhs b/compiler/main/Constants.lhs
index d26db11b9e..51971728a0 100644
--- a/compiler/main/Constants.lhs
+++ b/compiler/main/Constants.lhs
@@ -13,8 +13,6 @@ import Data.Bits (shiftL)
 -- we want; if we just hope a -I... will get the right one, we could
 -- be in trouble.
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 #include "../includes/MachRegs.h"
 #include "../includes/Constants.h"
diff --git a/compiler/main/DriverMkDepend.hs b/compiler/main/DriverMkDepend.hs
index 901b3bb7ce..4155274e31 100644
--- a/compiler/main/DriverMkDepend.hs
+++ b/compiler/main/DriverMkDepend.hs
@@ -35,6 +35,7 @@ import Panic
 import SrcLoc
 import Data.List
 import CmdLineParser
+import FastString
 
 import ErrUtils         ( debugTraceMsg, putMsg )
 
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 50b45017c4..59535f040c 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -45,6 +45,7 @@ import Maybes		( expectJust )
 import ParserCoreUtils	( getCoreModuleName )
 import SrcLoc		( unLoc )
 import SrcLoc		( Located(..) )
+import FastString
 
 import Control.Exception as Exception
 import Data.IORef	( readIORef, writeIORef, IORef )
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 3645e080cf..7fc2c9a01c 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -60,8 +60,6 @@ module DynFlags (
     compilerInfo,
   ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import Module
diff --git a/compiler/main/ErrUtils.lhs b/compiler/main/ErrUtils.lhs
index 455b3bfe37..9ce02a3d2c 100644
--- a/compiler/main/ErrUtils.lhs
+++ b/compiler/main/ErrUtils.lhs
@@ -28,8 +28,6 @@ module ErrUtils (
 	debugTraceMsg,	
     ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import Bag		( Bag, bagToList, isEmptyBag, emptyBag )
diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 0caa1cbbf7..bd6eee6a1b 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -266,6 +266,7 @@ import BasicTypes
 import Maybes		( expectJust, mapCatMaybes )
 import HaddockParse
 import HaddockLex       ( tokenise )
+import FastString
 
 import Control.Concurrent
 import System.Directory ( getModificationTime, doesFileExist,
diff --git a/compiler/main/HscStats.lhs b/compiler/main/HscStats.lhs
index 52e396dcde..e717bfec64 100644
--- a/compiler/main/HscStats.lhs
+++ b/compiler/main/HscStats.lhs
@@ -6,8 +6,6 @@
 \begin{code}
 module HscStats ( ppSourceStats ) where
 
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
 #include "HsVersions.h"
 
 import HsSyn
diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index 07c7568497..ec872626d0 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -112,7 +112,7 @@ import BreakArray
 import SrcLoc		( SrcSpan, Located )
 import LazyUniqFM		( lookupUFM, eltsUFM, emptyUFM )
 import UniqSupply	( UniqSupply )
-import FastString	( FastString )
+import FastString
 import StringBuffer	( StringBuffer )
 
 import System.FilePath
diff --git a/compiler/main/PackageConfig.hs b/compiler/main/PackageConfig.hs
index c070ca2efb..80488ec05f 100644
--- a/compiler/main/PackageConfig.hs
+++ b/compiler/main/PackageConfig.hs
@@ -22,10 +22,6 @@ import Distribution.Package
 import Distribution.Version
 import Distribution.Compat.ReadP ( readP_to_S )
 
--- warning suppression
-_unused :: FS.FastString
-_unused = FSLIT("")
-
 -- -----------------------------------------------------------------------------
 -- Our PackageConfig type is just InstalledPackageInfo from Cabal.  Later we
 -- might need to extend it with some GHC-specific stuff, but for now it's fine.
diff --git a/compiler/main/PprTyThing.hs b/compiler/main/PprTyThing.hs
index e57122b721..0609660285 100644
--- a/compiler/main/PprTyThing.hs
+++ b/compiler/main/PprTyThing.hs
@@ -27,6 +27,7 @@ import TcType
 import Var
 import Name
 import Outputable
+import FastString
 
 -- -----------------------------------------------------------------------------
 -- Pretty-printing entities that we get from the GHC API
diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 7200c35dca..a2362d91e5 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -75,7 +75,7 @@ module StaticFlags (
 
 import CmdLineParser
 import Config
-import FastString	( FastString, mkFastString )
+import FastString
 import Util
 import Maybes		( firstJust )
 import Panic
diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs
index 576c3fc1f1..97a5ea7bf6 100644
--- a/compiler/main/SysTools.lhs
+++ b/compiler/main/SysTools.lhs
@@ -74,7 +74,7 @@ import CString		( CString, peekCString )
 
 import System.Process	( runInteractiveProcess, getProcessExitCode )
 import Control.Concurrent( forkIO, newChan, readChan, writeChan )
-import FastString       ( mkFastString )
+import FastString
 import SrcLoc           ( SrcLoc, mkSrcLoc, noSrcSpan, mkSrcSpan )
 \end{code}
 
diff --git a/compiler/main/TidyPgm.lhs b/compiler/main/TidyPgm.lhs
index ca021222da..64f3498ad4 100644
--- a/compiler/main/TidyPgm.lhs
+++ b/compiler/main/TidyPgm.lhs
@@ -45,9 +45,6 @@ import FastBool hiding ( fastOr )
 import Data.List	( partition )
 import Data.Maybe	( isJust )
 import Data.IORef	( IORef, readIORef, writeIORef )
-
-_dummy :: FS.FastString
-_dummy = FSLIT("")
 \end{code}